Re: git mergetool vs stash apply

From: Jeff King <peff@peff.net>
Date: May 20, 2008, 09:02 UTC
Message-ID: <20080520090258.GB31703@sigill.intra.peff.net>
In-Reply-To: <c6c947f60805200102h3fd27742vfd9310912907cfa@mail.gmail.com>

On Tue, May 20, 2008 at 12:02:44PM +0400, Alexander Gladysh wrote:

Show 12 quoted lines

> The git mergetool ignores conflicts by git stash apply:
> 
> $ git stash apply
> Auto-merged path/file.ext
> CONFLICT (content): Merge conflict in path/file.ext
> 
> $ git mergetool
> merge tool candidates: kdiff3 kdiff3 tkdiff xxdiff meld gvimdiff
> opendiff emerge vimdiff
> No files need merging
> 
> While path/file.ext do contain merge conflict.

I think there is something else going on, because it _does_ generally work. This simple test case should confirm:

  mkdir repo && cd repo && git init
  echo content >file && git add . && git commit -m one
  echo changes >>file && git commit -a -m two
  echo more >>file && git stash
  git checkout -b other HEAD^
  echo different changes >>file && git commit -a -m three
  git stash apply
  git mergetool

I get:
  Normal merge conflict for 'file':
    {local}: modified
    {remote}: modified
  Hit return to start merge resolution tool (xxdiff):

So there is perhaps something specific about your setup or your conflict that is causing mergetool not to work as expected. Can you give us a test case that fails?

-Peff