Svn aborted commits remains in conflict

I use svn on daily basis. everything was ok until today when a new this kind of error popped up :


root@tfm33: /Space/server/_wks/trunk# svn commit
svn: Commit failed (details follow):
svn: Aborting commit: '/Space/server/_wks/trunk/libmp3lame' remains in conflict

An no matter what i tried it stayed in conflict. doing some google-ing i found out that the fix is quite simple:


svn resolved /Space/server/_wks/trunk/libmp3lame

Leave a Reply