All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pretty Boy Floyd <boxerab@gmail.com>
To: git@vger.kernel.org
Subject: Git Stash stages files if there is a conflict
Date: Fri, 15 Oct 2010 20:13:27 +0000 (UTC)	[thread overview]
Message-ID: <loom.20101015T220924-952@post.gmane.org> (raw)

Hello!

I am running msysgit 1.7.3.1.  If I run stash apply, and there is a conflict,
all of my stash changes get staged. Is this the correct behaviour? I found it a
little surprising.

Another question: if I have stashed 10 files, and there is a conflict in one of
them, will stash apply abort when it has a conflict, or will it apply all
non-conflicted files.


Finally, if I do the following:

git stash
git pull
git stash apply

and another developer has removed a file that I have stashed, then I am unable
to apply the stash  on this file. How can I retrieve my changes from the stash?


Thanks!

             reply	other threads:[~2010-10-15 20:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-15 20:13 Pretty Boy Floyd [this message]
2010-10-18  9:33 ` Git Stash stages files if there is a conflict Tor Arntsen
2010-10-18 17:18 ` Eric Raible
2010-10-18 17:56   ` Aaron Boxer

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=loom.20101015T220924-952@post.gmane.org \
    --to=boxerab@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 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.