Comments on: Integrating Git with a Visual Merge Tool http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/ meditations on scm using git Sat, 06 Mar 2010 13:29:39 +0000 http://wordpress.org/?v=2.8.5 hourly 1 By: Todyneneoup http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-45 Todyneneoup Sat, 06 Mar 2010 13:29:39 +0000 http://gitguru.com/?p=155#comment-45 http://panthersinfiniti.blogspot.com/2010/03/scholarship-infiniti-video-technologic.html video funny best games free. http://panthersinfiniti.blogspot.com/2010/03/scholarship-infiniti-video-technologic.html

video funny best games free.

]]> By: Todyneneoup http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-44 Todyneneoup Fri, 05 Mar 2010 12:53:43 +0000 http://gitguru.com/?p=155#comment-44 http://homogeneouslopes.blogspot.com/2010/03/video-fatima-lopes-flees-capturer.html games free best best download. http://homogeneouslopes.blogspot.com/2010/03/video-fatima-lopes-flees-capturer.html

games free best best download.

]]> By: MrGando http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-40 MrGando Mon, 21 Dec 2009 13:26:20 +0000 http://gitguru.com/?p=155#comment-40 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 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. http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-39 Saverio M. Mon, 30 Nov 2009 15:18:07 +0000 http://gitguru.com/?p=155#comment-39 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. ??? 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 http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-36 Tim Harper Fri, 18 Sep 2009 20:26:00 +0000 http://gitguru.com/?p=155#comment-36 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. 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) http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-31 The Power of Mind | Uniendo ramas en git (merge) Fri, 12 Jun 2009 14:15:00 +0000 http://gitguru.com/?p=155#comment-31 [...] Integrating Git with a Visual Merge Tool Tags: branch, git, merge [...] [...] Integrating Git with a Visual Merge Tool Tags: branch, git, merge [...]

]]> By: Carl-Johan Sveningsson http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-29 Carl-Johan Sveningsson Wed, 27 May 2009 14:26:51 +0000 http://gitguru.com/?p=155#comment-29 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 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

]]> By: Eric Labashosky http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-28 Eric Labashosky Sun, 10 May 2009 14:00:05 +0000 http://gitguru.com/?p=155#comment-28 Very nice article!!! maybe you knew this, but you can also tell git not create the .orig file(s); git config --global merge.keepBackup false Very nice article!!!

maybe you knew this, but you can also tell git not create the .orig file(s);
git config –global merge.keepBackup false

]]> By: Nathan Bowers http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-27 Nathan Bowers Sat, 02 May 2009 06:05:23 +0000 http://gitguru.com/?p=155#comment-27 Thanks for this post. I'm new to git and having a tough time without my Eclipse Subclipse SVN crutch :-) Thanks for this post. I’m new to git and having a tough time without my Eclipse Subclipse SVN crutch :-)

]]> By: long http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/comment-page-1/#comment-21 long Wed, 01 Apr 2009 08:05:22 +0000 http://gitguru.com/?p=155#comment-21 Thanks! And I did fix the tab order. The theme I'm using did set explicit values but didn't account for having both search and comment fields (aka they both started with tabindex="1"). Thanks!

And I did fix the tab order. The theme I’m using did set explicit values but didn’t account for having both search and comment fields (aka they both started with tabindex=”1″).

]]>