Queasy about merging .pbxproj
Queasy about merging .pbxproj
- Subject: Queasy about merging .pbxproj
- From: Jerry Krinock <email@hidden>
- Date: Wed, 09 Jul 2014 18:44:19 -0700
A new Feature branch of my Git-controlled project has a new target, added new files, deleted old files, deleted a Build Phase.
Now it’s time to merge. The Merge sheet shows me 46 changes in a .pbxproj file. 34 are due to the target and file changes, and Xcode as set the left/right “shifty eyeballs” switch to the Feature branch, and I understand and agree with those.
However, the other 12 of the changes regard files in the product’s Help Book, which may have been modified but not added or deleted, and it looks like half of these changes are effectively cancelled out by the other half. For example, I see reordering of elements in collections that are probably unordered, and changed unique identifiers. For these, Xcode has set the shifty eyeballs to the old Master branch.
Knowing that is great risk in messing with .pbxproj files, I’m looking for others’ experiences with this.
Is Xcode possibly smarter than me about where it sets the shifty eyeballs?
I want to switch the 12 Master-favoring eyeballs to the new Feature branch. I think that to leave 34 one way and 12 the other way, as Xcode has, could result in an self-inconsistent pbxproj file, and possible disaster, maybe latent. My logic makes sense to me, except that someone who suggested this in Stack Overflow had 13 people pile on him with down votes. I think the extreme reaction was because this person was suggesting “all left” or “all right" as a general rule, not, as in my case, where only one branch has changed the project structure.
One more thing – is Xcode going to appreciate git editing a pbxproj file on disk while Xcode has it open? Even though I’m using the Xcode GUI, I presume that it invokes git under the hood.
Thanks,
Jerry
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden