Re: Quicktime Movie View error
Re: Quicktime Movie View error
- Subject: Re: Quicktime Movie View error
- From: elliott cable <email@hidden>
- Date: Fri, 6 Feb 2009 07:21:36 -0900
On Thu, Feb 5, 2009 at 11:02 PM, Kyle Sluder <email@hidden> wrote:
> On Fri, Feb 6, 2009 at 1:05 AM, elliott cable <email@hidden> wrote:
>> today, and I'm running into the same problem. Does anybody know how I
>> can fix it *without* switching away from XIBs? (I'm versioning my
>> stuff in git, I have to use XIBs to get merging functionality).
>
> How is Git able to merge changes to XIBs? The structure of an XIB
> isn't linear; there's no guarantee that you can just swap out portions
> of an XIB and wind up with a usable XIB. Unless Git has an
> understanding of XIBs near Apple's, I don't see how merging could be
> guaranteed to work.
>
> --Kyle Sluder
It's actually a complex process. It requires that you manually manage
your XIB changes to some extent, in a painful way (I'm in the middle
of writing a tool to do all of that for me), and even then, there are
circumstances where such a process would fail.
The important point is that two people working on completely separate
parts of the XIB, for instance concurrent commits that both add a new
item to the interface instead of changing any existing items, can be
merged. You're still up <expletive deleted> creek when it comes to
concurrent commits that modify the exact same piece of the interface
in different ways.
I blogged extensively about the topic:
<http://blog.elliottcable.name/posts/git_versioning_interface_builder_s_xib_files.xhtml>
_______________________________________________
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