How to merge conflicts (file project.pbxproj) in Xcode use svn?

by

I use git but we see the same issue – if two people add files there’s a merge conflict.

Usually the editing is very easy though. Simply go into the project.pbxproj file with a text editor, and look for the merge conflict section – usually this is marked by something like :

>>>>>>>
Stuff 1
======
Stuff 2
<<<<<<<<

In 99% of Xcode project merge conflict cases, you simply want to accept both sides of the merge (because two people added different files) – so you would simply delete the merge markers, in the above case that would end up like:

Stuff 1
Stuff 2

Like I said, this works great in MOST cases. If Xcode will not read the project file when you are done, just take the most recent un-merged version and manually add your files again.

More Related Contents:

  1. Xcode 4 – “Valid signing identity not found” error on provisioning profiles on a new Macintosh install
  2. Cannot generate iOS App archive in xcode
  3. Xcode 5 and iOS 7: Architecture and Valid architectures
  4. Gesture recognizer and button actions
  5. Can the UI Automation instrument be run from the command line?
  6. /usr/bin/codesign failed with exit code 1
  7. Is there any limit in storing values in NSUserDefaults?
  8. Xml parsing in iOS tutorial [closed]
  9. How does one compare one image to another to see if they are similar by a certain percentage, on the iPhone?
  10. What exactly does delegate do in xcode ios project?
  11. How to send Asynchronous URL Request?
  12. How to create DropDown in xcode?
  13. Trying to read a Xcode Instruments .trace file. What is the file format of a .trace file?
  14. NSString retainCount is 2147483647 [duplicate]
  15. Xcode always stopping at main.m after a crash
  16. Could not find a storyboard named ‘Main’ in bundle
  17. How do I install this script into PhoneGap for iOS
  18. Embedding Python in an iPhone app
  19. Black screen instead of launch image on iPad
  20. UITableView scroll smooth with certain speed?
  21. iPhone Facebook Video Upload
  22. How to use ldid?
  23. Include a resource directory hierarchy into app bundle
  24. Xcode – iPhone – profile doesn’t match any valid certificate-/private-key pair in the default keychain
  25. Does storyboard eliminate the need for .nib
  26. Is there a way to downgrade from iOS 5.1 to iOS 5.0? [closed]
  27. Cleaning up the iPhone simulator
  28. iPhone : How to set BackgroundColor of UIButton with buttonType UIButtonTypeCustom
  29. How to display the current project version of my App to the user?
  30. Xcode — get force_load to work with relative paths

Leave a Comment