Menu
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?
729
To resolve a conflict do one of three things: Merge the conflicted text by hand (by examining and editing the conflict markers within the file). Copy one of the temporary files on top of the working file. Run svn revert FILENAME to throw away all of the local changes.
Yes, C is for conflict. You want: svn resolve --accept mine-full my_sysconfig.ini.
Step 1: View Conflicts Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: Subversion is complaining that there is a conflict with the README file, and Subversion does not know how to solve this. So Jerry chooses the df option to review the conflict.
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
68
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
