I don't merge every 5 minutes, I commit every 5 minutes. One of the advantages of extremely granular commits is that I'm also pulling in other peoples' changes practically in realtime - and more importantly, I use git's feature branching. So I only have to do a merge every, hmm, half month to a month on a given really active project on which I'm working with other people? Since I'm relatively new to Cocoa, that means I've only run into a XIB-based merge conflict, uh, twice.
In other words, it works out pretty well given that it's a closed format! On Fri, Feb 6, 2009 at 11:05 PM, Graham Cox <graham....@bigpond.com> wrote: > > On 7 Feb 2009, at 7:00 pm, elliott cable wrote: > >> While the merging may be not perfect, it works 99% of the time - and >> that's more than enough. >> >> It works especially well if you commit as granularly as I do (one >> commit between every one and three minutes, no longer than 5 minutes - >> every single change gets it's own commit) > > > So, 1% of the time it doesn't work, and you're committing every 5 minutes. > That's one failure every 8 hours! If I had a broken xib that often I'd get > pretty PO'd (after all, IB on its own breaks them now and again, and that's > bad enough). > > --Graham > > > -- ~ elliottcable http://elliottcable.name || m...@elliottcable.name || +1.919.636.4204 _______________________________________________ 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
