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

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

From
Scott Parish <srp@srparish.net>
Date
Oct 22, 2007, 04:39 UTC
Message-ID
<20071022043933.GL16291@srparish.net>
In-Reply-To
<Pine.LNX.4.64.0710212338200.25221@racer.site>
> You should have a look into Documentation/diff-format.txt (section 
> "combined diff format") to learn more.

Ah, thanks for the pointer; i hadn't realized that this wasn't standard diff format. With this and what Shawn said, it all makes sense now.

sRp
-- 
Scott Parish
http://srparish.net/
Previous: Shawn O. Pearce
Message 4 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.