From: "Alexander Gladysh" <agladysh@gmail.com>
To: git@vger.kernel.org
Subject: git mergetool vs stash apply
Date: Tue, 20 May 2008 12:02:44 +0400 [thread overview]
Message-ID: <c6c947f60805200102h3fd27742vfd9310912907cfa@mail.gmail.com> (raw)
Hi, list!
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.
The git mergetool works for git merge and git rebase. Maybe it should
work for git stash as well? I automatically type git mergetool when I
see CONFLICT in Git output. %-)
Alexander.
next reply other threads:[~2008-05-20 8:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-20 8:02 Alexander Gladysh [this message]
2008-05-20 9:02 ` git mergetool vs stash apply Jeff King
2008-05-20 11:16 ` Alexander Gladysh
2008-05-20 11:52 ` Jakub Narebski
2008-05-20 12:32 ` Alexander Gladysh
2008-05-20 12:45 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c6c947f60805200102h3fd27742vfd9310912907cfa@mail.gmail.com \
--to=agladysh@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).