Resolve postponed conflicts with SVN

svn visualsvn-server
Matt Hudson picture Matt Hudson · Mar 8, 2012 · Viewed 18.4k times · Source

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?

Answer

Mark Phippard picture Mark Phippard · Mar 8, 2012

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

Related questions

Working Copy Locked

I'm developing a web using subversion as version control, but got "working directory locked" error message Here's the story: I have PC-A: Windows XP Pro VisualSVN 2.5.2 Tortoise SVN 1.7.3 PC-B: Windows XP Home Tortoise SVN 1.7.3 I have create repository on PC-A …

Read More
SVN Commit failed, access forbidden

Recently I am facing problem of commit to SVN. The SVN server I am using is VisualSVN Server 2.5.9 and the client is TortoiseSVN 1.7.12. At first, one user is having problem to commit files to SVN. But that user still can …

Read More
Change repository on your folder with TortoiseSVN

I accidentally created a repository without the default folders in TortoiseSVN then did a checkout locally. Realized hey, I forgot to create that repository with the defaults so I deleted the repository using VisualSVN Server and then recreated the same …

Read More