linux svn node remains in conflict code example Example: svn node remains in conflict svn resolved <PATH>