From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Scott Parish <sRp@srparish.net>
Cc: git@vger.kernel.org
Subject: Re: how to deal with conflicts after "git stash apply"?
Date: Sun, 21 Oct 2007 23:40:51 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0710212338200.25221@racer.site> (raw)
In-Reply-To: <20071021223206.GJ16291@srparish.net>
Hi,
On Sun, 21 Oct 2007, Scott Parish wrote:
> How is the intended way to deal with "git stash apply" conflicts?
> If i just edit the file and remove the conflict, "git diff" gives
> some really messed up output. Documentation for other commands and
> conflicts suggest "git commit" after cleaning up the conflict, or
> "git add", but in the case of "stash apply" i'm not ready for a
> commit yet, and "git add" keeps "git diff" from showing any output.
You are probably seeing combined diffs.
This show not only the differences of the working tree relative to HEAD,
but also of the changes stored in the stash.
You should have a look into Documentation/diff-format.txt (section
"combined diff format") to learn more.
Hth,
Dscho
next prev parent reply other threads:[~2007-10-21 22:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-21 22:32 how to deal with conflicts after "git stash apply"? Scott Parish
2007-10-21 22:40 ` Johannes Schindelin [this message]
2007-10-22 4:26 ` Shawn O. Pearce
2007-10-22 4:39 ` Scott Parish
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=Pine.LNX.4.64.0710212338200.25221@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sRp@srparish.net \
/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).