On Wed, Dec 19, 2007 at 09:44:47AM -0800, Andrew Lentvorski wrote:
Now, I would like to know if this is different from how git does things. Does git never launch a visual diff tool?
Not by default. If there are no conflicts, it will do the auto-merge (using 'merge', like everything else does). If there are conflict markers, it leaves the marker annotations that merge puts in the file, and lets you decide what to do. The various guis can invoke visual diff tools. What makes it so flexible is that upon merge conflict, git exits, and it's index is able to keep track of the state of the merge. So, it doesn't really care how you resolve the merge, just that you do, and tell it that you've done so, and it will then finish the merge. It also makes it nice when you see that the merge conflicts badly, that you can just undo the merge, and nothing will have been changed. This is useful when you realize you just merged the wrong thing. Dave -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
