Search code examples
svnvisualsvn-server

Resolve postponed conflicts with SVN

I'm fairly new to SVN command line in a team environment. I accidentally postponed merging revisions. After doing:

svn status

I get:

?       Trivial/Trivial.xcodeproj/project.pbxproj.mine
?       Trivial/Trivial.xcodeproj/project.pbxproj.r280
?       Trivial/Trivial.xcodeproj/project.pbxproj.r276

However, I do not know how to merge these changes. Currently I'm getting an error with XCode saying the project cannot be parsed. Can someone show me how to merge these revisions?

Solution

  • Those files exist to help you run diffs or 3-way merges. The main version of the file will contain the conflicting code as well with markers surrounding the conflicts. So another option is to just edit the main file, search for those markers. Resolve the conflicts and remove the markers.

    When done, you run a command like:

    svn resolve --accept=working Trivial/Trivial.xcodeproj/project.pbxproj

    This will remove those other files. You will also see that command includes options to resolve the conflict by simply accepting all the changes from one of those files.

    See: http://svnbook.red-bean.com/en/1.7/svn.tour.cycle.html#svn.tour.cycle.resolve