When doing an update in SVN, you get X tree conflict(s). There are two ways to resolve these conflicts:
- You can use the following command to resolve the conflict: svn resolve –accept working -R (Path)
For more details on this, use svn resolve –help
- The second way to resolve the conflict is to simply revert the conflicting file(s) to the version in the code you are updating – which is probably what you were intending to do anyway, when you did SVN update. To do this, do an svn stat to see what files have a conflict (detonated by a preceding ‘C’ character). Then type svn revert (path) -R to revert that particular conflict.