On Fri, Feb 6, 2009 at 1:05 AM, elliott cable <m...@elliottcable.name> 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 _______________________________________________ Cocoa-dev mailing list (Cocoa-dev@lists.apple.com) 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: http://lists.apple.com/mailman/options/cocoa-dev/archive%40mail-archive.com This email sent to arch...@mail-archive.com