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 🙂
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.
It worked! Now I’ve got to know about terminal command in SVN –help. Thank you for posting this!