Re:Our Git Workflow: Private Development, Public Releases
by Zev on Tuesday August 17, 2010 @06:36PM
(#1612667)
Merging is still a pain with git. Especially if you have to deal with xib or xcodeproj files (for iPhone/Mac dev). To the point where the usual process I see amounts to "don't touch this file -- I'm working with it (and don't want to lose any work)." instead of dealing with a merge that is almost guaranteed to make someone lose work.
[ Parent
| on HN ]
There are no comments on this comment yet.