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

Re: how to deal with conflicts after "git stash apply"?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 21, 2007, 22:40 UTC
Message-ID
<Pine.LNX.4.64.0710212338200.25221@racer.site>
In-Reply-To
<20071021223206.GJ16291@srparish.net>
Hi,
On Sun, 21 Oct 2007, Scott Parish wrote:
Show 6 quoted lines
> 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

Previous: Scott ParishNext: Shawn O. Pearce
Message 2 of 4 in “how to deal with conflicts after "git stash apply"?”
  1. Scott ParishOct 21, 2007
  2. Johannes SchindelinOct 21, 2007
  3. Shawn O. PearceOct 22, 2007
  4. Scott ParishOct 22, 2007

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.