svn: Aborting commit: remains in conflict

By + on February 11, 2009 in Linux

Digg This
Flattr this!http://www.idimmu.net/wp-includes/images/smilies/icon_smile.gif

I got this annoying SVN error today, that I hadn’t come across before. Even after resolving the conflict in the file, highlighted by lots of <<<<<<<, I still couldn’t get my commit to work!

idimmu@boosh:~/work/systems/trunk/dns$ svn ci idimmu.net -m “new funky domain”
svn: Commit failed (details follow):
svn: Aborting commit: ‘/home/rus/work/systems/trunk/dns/idimmu.net’ remains in conflict

After some reading it was easy to resolve!

idimmu@boosh:~/work/systems/trunk/dns$ svn resolved idimmu.net

Resolved conflicted state of ‘idimmu.net’

rus@boosh:~/work/systems/trunk/dns$ svn ci idimmu.net -m “new funky domain”
Sending idimmu.net
Transmitting file data .
Committed revision 14281.

A lesson in regular svn updateing I guess :)

Version Control with Subversion

For more SVN advice, I recommend Version Control with Subversion by O’Reilly. It contains everything you need to know when using or managing SVN repositories.

Digg This
Flattr this!http://www.idimmu.net/wp-includes/images/smilies/icon_smile.gif

About rus

Arrogant, narcissistic and imperatively logical. I first started coding in the mid 80s on an Amstrad 6128, entering games found in the back of Amstrad Action.After watching Hackers and falling in love with Angelina Jolie I installed Slackware 2.0 on a P200 in 1997and spent the next 6-7 years studying computery things at various colleges and universities.Several years later I can now be found in an office premises by day sat in front of a Macbook, using a Windows VM to manage Linux servers, or in a field by night, fire dancing and holding pyrotechnics casually in my hands whilst they explode.
View all posts by rus →

One Response to svn: Aborting commit: remains in conflict

  1. Yoon June 18, 2012 at 4:56 am #

    It worked! Now I’ve got to know about terminal command in SVN –help. Thank you for posting this!

    Reply

Leave a Reply