On Wed, Dec 19, 2007 at 10:42:39AM -0800, SJS wrote:
And hey, I was reading the webpage. It suprised the hell out of me that if I _don't_ have a three-way merge program installed, configured, and accessible, I'm toast. I haven't taken any time to experiment with the merging in hg or git.
It is a little annoying that it seems to just fail if the tool isn't installed. With git, it basically stops, and lets you run a merge tool at that point. You can even use different tools for different merge cases, since some might do better than others. As far as the common ancestor. The reason that I said it is important is that if you don't chose a good common ancestor, you may end up giving your file merge tool way too much work. Git also has another interesting tool, that I haven't used yet, that they call 'rerere - Reuse recorded resolution of conflicted merges'. It is for when you have long lived topic branches. Instead of having to remember the same conflict resolution and resolve it the same way, once you resolve something, it can remember how you did it. It basically allows you to keep your tree clean, but not make you resolve the same conflicts over again. It's fairly pick about when it will do this, but apparently it often saves quite a bit of work. Dave -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
