Re: Trouble forking my project
Re: Trouble forking my project
- Subject: Re: Trouble forking my project
- From: email@hidden
- Date: Thu, 25 Mar 2010 13:23:18 -0400
On Mar 25, 2010, at 11:12 AM, Sean McBride wrote:
> On Wed, 24 Mar 2010 16:48:49 -0700, Dave Carrigan said:
>
>> Create a branch for your feature, do all the work on that branch, then
>> merge it to the trunk when it's ready. Put your released product in a
>> different branch and do your bugfixes on that branch and merge them to
>> trunk. Don't work on trunk at all. except to integrate all merges in
>> preparation for the next release.
>
> That's all fine and good until you need to change a xib (or worse,
> nib). xibs are neither diffable nor auto-mergeable. In my experience,
> they are the single biggest PITA when trying to work with branches. I
> actually find myself missing Rez<->DeRez.
>
> --
> ____________________________________________________________
> Sean McBride, B. Eng email@hidden
> Rogue Research www.rogue-research.com
> Mac Software Developer Montréal, Québec, Canada
I thought xib files were diffable - aren't they just XML files - while nib files were binary files and not diffable or mergeable.
I admit I get a little worried when trying to merge multiple changes on some XML files such as the project.pbxproj if multiple different files have been added to the project on different computers.
Can anyone speak authoritatively on this? Can you reliably merge the various XML files that Xcode/IB uses using the tools in version control systems (I'm using Mercurial now)?
Thanks,
Dave
_______________________________________________
Cocoa-dev mailing list (email@hidden)
Please do not post admin requests or moderator comments to the list.
Contact the moderators at cocoa-dev-admins(at)lists.apple.com
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden