Igor Kromin |   Consultant. Coder. Blogger. Tinkerer. Gamer.

| Views: 22736
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:
Updating '.':
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.


Have comments or feedback on what I wrote? Please share them below! Found this useful? Consider sending me a small tip.
comments powered by Disqus
Other posts you may like...