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

Re: Merge conflicts as .rej .orig files

From
Linus Torvalds <torvalds@osdl.org>
Date
Aug 19, 2005, 04:29 UTC
Message-ID
<Pine.LNX.4.58.0508182125490.3412@g5.osdl.org>
In-Reply-To
<46a038f9050818200625d64a12@mail.gmail.com>
On Fri, 19 Aug 2005, Martin Langhoff wrote:
> 
> Is there a way to convince cogito/git to leave reject files around?
Nope.

Git just doesn't deal in patches. There's never any patch rejects: there are just two source files that get merged.

The ".orig" and ".rej" things are signs of patch-based systems.

I'm sure you could fake it, but I'm also sure that there's an emacs mode for the "merge" style diffs. It is, after all, what CVS and RCS have used, so I'd expect that there be tons of support for making it look nice and help merges.

		Linus
Previous: Martin LanghoffNext: Catalin Marinas
Message 2 of 4 in “Merge conflicts as .rej .orig files”
  1. Martin LanghoffAug 19, 2005
  2. Linus TorvaldsAug 19, 2005
  3. Catalin MarinasAug 19, 2005
  4. Daniel BarkalowAug 19, 2005

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.