From: Kelvie Wong Date: Thu, 27 Sep 2007 19:24:38 GMT Subject: Re: Mergetool generating blank files (1.5.3) Message-ID: <94ccbe710709271224rc65b6f4k8b68419629ed5b45@mail.gmail.com> In-Reply-To: <20070927185707.GC12427@artemis.corp> I've tried all of the ones that were supported, the result is the same -- blank files in all three windows. It is because git mergetool fails to generate these files for whatever reason (the filebasename.{REMOTE,LOCAL,BASE}.* files). I don't know why this happens. As for merge utilities, all I need is something that looks for the first <<<<<, and lets me choose which version I want (either top or bottom), plain and simple :/ I don't even need/want a gui. But oh well, I guess the answer here is to write a script that does it. Kelvie On 9/27/07, Pierre Habouzit wrote: > On Thu, Sep 27, 2007 at 06:31:19PM +0000, Kelvie Wong wrote: > > At work, I've been using a git-svn import for my daily workflow (still > > somewhat of a git newbie, but now has come to the point where it's > > tough to work without it), and while rebasing from svn (on a rather > > old branch), I found that the mergetool option does not work too well > > for me. > > Which tool are you using ? kdiff3 ? I've noticed that it often fails > miserably, or worse, create bad merges silentely with it. > > And as none of the other merge tool that are supported are able to > either do 3way merges, or have a decent UI (that definitely seems to be > exclusive features) I've given up on git-mergetool (and to be fair, it > sucks, because it could be _sooo_ useful sometimes). > > -- > ·O· Pierre Habouzit > ··O madcoder@debian.org > OOO http://www.madism.org > > -- Kelvie