git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Git Stash stages files if there is a conflict

From
TATor Arntsen <tor@spacetec.no>
Date
Oct 18, 2010, 09:33 UTC
Message-ID
<AANLkTimrVgegd4mHsEbhs3O78T=zkF4Ns7F2LMEKjm=C@mail.gmail.com>
In-Reply-To
<loom.20101015T220924-952@post.gmane.org>
On Fri, Oct 15, 2010 at 22:13, Pretty Boy Floyd <boxerab@gmail.com> wrote:
Show 5 quoted lines
> 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.

I have no answer to the above, just noting that I observed exactly the same yesterday (git 1.7.1) and was a little surprised too. Not that it created any problems as such, just raised eyebrows.

[..]
-Tor
Previous: Pretty Boy FloydNext: Eric Raible
Message 2 of 4 in “Git Stash stages files if there is a conflict”
  1. Pretty Boy FloydOct 15, 2010
  2. Tor ArntsenOct 18, 2010
  3. Eric RaibleOct 18, 2010
  4. Aaron BoxerOct 18, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.