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

Re: [RFC] Merge strategy 'applyreject'

From
Jakub Narebski <jnareb@gmail.com>
Date
Sep 13, 2006, 21:54 UTC
Message-ID
<ee9ult$mtn$1@sea.gmane.org>
In-Reply-To
<20060913215043.GE30782@spearce.org>
Shawn Pearce wrote:
> But I don't really want this as a merge strategy in its own right.
> I want it as part of merge-recur (...)

Wouldn't it be better to have pluggable way to deal with conflicts, be it diff3/merge with conflict markers, .rej files, or invoking graphical merge tool (vimdiff, Emacs Emerge, xxdiff, Meld, KDiff3)?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Shawn PearceNext: Shawn Pearce
Message 5 of 10 in “[RFC] Merge strategy 'applyreject'”
  1. Shawn PearceSep 13, 2006
  2. Petr BaudisSep 13, 2006
  3. Junio C HamanoSep 13, 2006
  4. Shawn PearceSep 13, 2006
  5. Jakub NarebskiSep 13, 2006
  6. Shawn PearceSep 13, 2006
  7. Petr BaudisSep 13, 2006
  8. Shawn PearceSep 13, 2006
  9. Jakub NarebskiSep 13, 2006
  10. Shawn PearceSep 13, 2006

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.