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

Merge conflicts as .rej .orig files

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Aug 19, 2005, 03:06 UTC
Message-ID
<46a038f9050818200625d64a12@mail.gmail.com>

After using arch for a while, I've gotten used to getting .rej and .orig files instead of big ugly conflict markers inside the file. Emacs has a nice 'diff' mode that is a boon when dealing with conflicts this way.

Is there a way to convince cogito/git to leave reject files around? What utility is git using to do the merges? Or at least: where should I look?

cheers,
martin
Next: Linus Torvalds
Message 1 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.