21-Jul-2014
I had the 'Node remains in conflict' error message come up recently due to an SVN update, this is how it's resolved. This error came about because I had a file in my local checkout that was not under version control, someone checked in a file with the same name into SVN. This should never have happened, the repository had its file deleted, yet every time I did an update, I got this error.
This is what the SVN output looked like:
Skipped 'xxxxWS/xxxxWS.jpr' -- Node remains in conflict
To fix, just resolve with the working copy:
svn resolve --accept=working xxxxWS/xxxxWS.jpr
The error goes away after this and the local changes are not affected.
-i
A quick disclaimer...
Although I put in a great effort into researching all the topics I cover, mistakes can happen.
Use of any information from my blog posts should be at own risk and I do not hold any liability towards any information misuse or damages caused by following any of my posts.
All content and opinions expressed on this Blog are my own and do not represent the opinions of my employer (Oracle).
Use of any information contained in this blog post/article is subject to
this disclaimer.
Igor Kromin
