Database Reference
In-Depth Information
crash Xcode if you happen to have the project open at the time you do the merge).
Opening the file reveals the conflicts, which will occur in several sections. Here's an
example (the lines have been truncated for readability):
<<<<<<< project.pbxproj
1A05AE0613BB5F880080AAD4 /* SplashScreen.xib */ = ...
=======
1A05AE1213BB63210080AAD4 /* TwitterAPI.h */ = ...
1A05AE1313BB63210080AAD4 /* TwitterAPI.m */ = ...
>>>>>>> 1.2
So, Tom is going to get to edit his
project.pbxproj
file by hand, looking for the conflicts
and resolving them. In this case, it's pretty simple, because he can just take the changes
made from both sides, ending up with the project view shown in
Figure 2-4
.
Figure 2-4. The merged project view
More Merge Mayhem
“OK,” you may be saying to yourself, “It's messy, but I can deal with doing some
merging every time someone adds new files to the project.” But adding files is just the
beginning of your troubles. The project file is changed whenever you change the build
target in Xcode. It gets changed if you update your provisioning profile. Adding a group,
moving files between groups—you name it, and it somehow is going to mess with the
project file.
You can end up with all sorts of disasters if you merge the project file incorrectly, from
broken builds to projects that won't open at all inside Xcode. They are far from human-
readable, although once you've had to deal with enough merge issues, you start to get
the lay of the land a bit.
