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

Re: Merge conflicts as .rej .orig files

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Aug 19, 2005, 08:27 UTC
Message-ID
<tnxmznepbzn.fsf@arm.com>
In-Reply-To
<46a038f9050818200625d64a12@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> wrote:
Show 8 quoted lines
> 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?

You could have a look at StGIT as well. The tool you use for merges is configurable via the stgitrc file (diff3 is used by default, which leaves markers in the file). StGIT also leaves the 3 files involved in the tree-way merge as <file>.{older,local,remote} for further inspection.

If you prefer other tool than diff3, you can define it in the stgitrc file. Two examples are given for emacs and xxdiff. You could also write a small script which invokes diff3 by default and, if it fails, run the emacs ediff-merge-files-with-ancestor function.

-- 
Catalin
Previous: Linus TorvaldsNext: Daniel Barkalow
Message 3 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.