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

Re: git stash and manually edited chunks

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Nov 2, 2010, 09:02 UTC
Message-ID
<vpqd3qoxfma.fsf@bauges.imag.fr>
In-Reply-To
<AANLkTiknhRGuBMFEKbVdyN83SiF9j2nNz=v-nMaD-iTb@mail.gmail.com>
Olivier Verdier <zelbier@gmail.com> writes:
> Thank you,
>
> but that does not explain why there is a conflict *only* when I edit
> the chunk manually, does it?
It does.

If you did not edit the hunk manually, each hunk will be either in state HEAD or in state A, and applying the diff between HEAD and A to such file will be either a no-op (hunk already applied), or a successfull application.

> Besides, some people tried to reproduce my problem on Linux and they
> got no conflict after edited chunks.
I did, on Linux. I get the same behavior as you.
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Olivier VerdierNext: Gavin Guo
Message 4 of 6 in “git stash and manually edited chunks”
  1. Olivier VerdierNov 1, 2010
  2. Matthieu MoyNov 1, 2010
  3. Olivier VerdierNov 2, 2010
  4. Matthieu MoyNov 2, 2010
  5. Gavin GuoNov 3, 2010
  6. Matthieu MoyNov 3, 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.