Alan Keefer (![[info]](http://l-stat.livejournal.com/img/userinfo.gif){kind=small} akeefer) wrote, |
Yeah, git seems to be the new hotness, as it were. It's what all the cool kids are using, and as such I'm going to push for us to use it for any projects we open-source out of Guidewire.
Merging branches, though, is definitely just always a pain in the ass. It works best if different branches are working on different subsystems and different files (or at least different parts of the same files), but as soon as you have people concurrently modifying stuff it gets nasty.
We use perforce at work, but we're big enough now that we have to work in separate branches that we then integrate together into one main "stable" branch per release, and being the guy who does the merges between my branch and the stable branch is no fun at all.
Merging branches, though, is definitely just always a pain in the ass. It works best if different branches are working on different subsystems and different files (or at least different parts of the same files), but as soon as you have people concurrently modifying stuff it gets nasty.
We use perforce at work, but we're big enough now that we have to work in separate branches that we then integrate together into one main "stable" branch per release, and being the guy who does the merges between my branch and the stable branch is no fun at all.
