Re: git mergetool vs stash apply

From: Alexander Gladysh <agladysh@gmail.com>
Date: May 20, 2008, 11:16 UTC
Message-ID: <c6c947f60805200416s61b0cc1eqd6d6c804abd15b4@mail.gmail.com>
In-Reply-To: <20080520090258.GB31703@sigill.intra.peff.net>

On Tue, May 20, 2008 at 1:02 PM, Jeff King <peff@peff.net> wrote:

Show 32 quoted lines

> On Tue, May 20, 2008 at 12:02:44PM +0400, Alexander Gladysh wrote:
>
>> 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):

Yes, I get the that output on clean repo. And I get that output also if I use actual conflict data (that is, three snapshots of conflicted file) instead.

> So there is perhaps something specific about your setup or your conflict
> that is causing mergetool not to work as expected.

Most likely so.

> Can you give us a test case that fails?

No, unfortunately I can not. I was unable to produce a minimal test case, and I can not share the whole repo.

Alexander.