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 protected] Rogue Research www.rogue-research.com Mac Software Developer Montréal, Québec, Canada _______________________________________________ Cocoa-dev mailing list ([email protected]) 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 [email protected]
