Comments on: Integrating Git with a Visual Merge Tool

By: Setting vimdiff as Git mergetool on Mac using MacVim « Flashes of Insight

Setting vimdiff as Git mergetool on Mac using MacVim « Flashes of Insight — Fri, 30 Jul 2010 00:17:54 +0000

[...] Integrating Git with a Visual Merge Tool [...]

By: Gergo

Gergo — Tue, 13 Jul 2010 16:43:50 +0000

Another thing I found useful: in git-gui, right click a conflicted file, and pick ‘Run merge tool’ context menu.

This way you can pick the conflicts you want to go through in one pass, as well as see the diff in advance; rather than relying on the order git-mergetool’s loop dictates.

By: Matt

Matt — Fri, 07 May 2010 21:54:56 +0000

I finally now can understand mergetool. Well written article. thanks a lot!!

By: Todyneneoup

Todyneneoup — Sat, 06 Mar 2010 13:29:39 +0000

http://panthersinfiniti.blogspot.com/2010/03/scholarship-infiniti-video-technologic.html

video funny best games free.

By: Todyneneoup

Todyneneoup — Fri, 05 Mar 2010 12:53:43 +0000

http://homogeneouslopes.blogspot.com/2010/03/video-fatima-lopes-flees-capturer.html

games free best best download.

By: MrGando

MrGando — Mon, 21 Dec 2009 13:26:20 +0000

Hello, I have a question, how do I setup the opendiff (FileMerge) as the default and global merge.tool ? Didin’t quite got that from reading the article.

Thanks

By: Saverio M.

Saverio M. — Mon, 30 Nov 2009 15:18:07 +0000

I setup Diffmerge on Mac, and aside from the obvious rename of “diffmerge.sh” to “diffmerge”, when I try to merge a conflict (I’m talking about my first attemp using diffmerge with git – on ubuntu/meld it was straightforward), diffmerge quits saying it can’t find the BASE version file – in fact, I can see only the BACKUP, LOCAL and REMOTE in the filesystem during the merge.

???

By: Tim Harper

Tim Harper — Fri, 18 Sep 2009 20:26:00 +0000

It appears that in git 1.6.3-rc1 and later, the setting to tell git to not leave the .orig files hanging around is “mergetool.keepBackup”, and no longer “merge.keepBackup”.

see git.git commit 70af4e9 and the man page for git-config.

By: The Power of Mind | Uniendo ramas en git (merge)

The Power of Mind | Uniendo ramas en git (merge) — Fri, 12 Jun 2009 14:15:00 +0000

[...] Integrating Git with a Visual Merge Tool Tags: branch, git, merge [...]

By: Carl-Johan Sveningsson

Carl-Johan Sveningsson — Wed, 27 May 2009 14:26:51 +0000

Amazing blog post indeed! I just noticed the power of mergetool…

Anyway, I am still missing a shining tool to manage merges where say a bunch of similar files have changed names, because git considers these as additions/deletions?

Also, I’m trying to find out how to interact with the :1:, :2: and :3: stages more than showing the files, but that’s maybe out of scope here