Re: Queasy about merging .pbxproj
Re: Queasy about merging .pbxproj
- Subject: Re: Queasy about merging .pbxproj
- From: Alex Zavatone <email@hidden>
- Date: Wed, 09 Jul 2014 22:27:25 -0400
Same here. It's not that bad. Mostly files added, groups created and files in them and then if people on our team can't get a consistent provisioning profile, then it's constantly changing those.
Haven't had an issue with it - yet.
Have a merge to do in the morn.
On Jul 9, 2014, at 10:14 PM, Rich Siegel wrote:
> I can't speak to the rest of it, but:
>
> On Wednesday, July 9, 2014, Jerry Krinock <email@hidden> wrote:
>
>> 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.
>
> I have routinely done svn conflict resolutions and mass structural changes via search-and-replace (and sometimes sorting lines :-)) on live projects without any difficulty.
>
> Provided that the project file written to disk is well formed and internally consistent, there won't be a problem. "Professional on closed course; do not attempt." :-)
>
> Good luck,
>
> R.
> --
> Rich Siegel Bare Bones Software, Inc.
> <email@hidden> <http://www.barebones.com/>
>
> Someday I'll look back on all this and laugh... until they sedate me.
>
>
> _______________________________________________
> 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
_______________________________________________
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