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):
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
