From: Scott Parish <sRp@srparish.net>
To: git@vger.kernel.org
Subject: how to deal with conflicts after "git stash apply"?
Date: Sun, 21 Oct 2007 15:32:07 -0700 [thread overview]
Message-ID: <20071021223206.GJ16291@srparish.net> (raw)
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.
Thanks for any clarification
sRp
--
Scott Parish
http://srparish.net/
next reply other threads:[~2007-10-21 22:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-21 22:32 Scott Parish [this message]
2007-10-21 22:40 ` how to deal with conflicts after "git stash apply"? Johannes Schindelin
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=20071021223206.GJ16291@srparish.net \
--to=srp@srparish.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.