svn: Aborting commit: remains in conflict
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 […]