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

Re: [RFC] Merge strategy 'applyreject'

From
Petr Baudis <pasky@suse.cz>
Date
Sep 13, 2006, 21:16 UTC
Message-ID
<20060913211617.GJ23891@pasky.or.cz>
In-Reply-To
<20060913210817.GA30782@spearce.org>

Dear diary, on Wed, Sep 13, 2006 at 11:08:17PM CEST, I got a letter where Shawn Pearce <spearce@spearce.org> said that...

Show 7 quoted lines
> Create merge strategy 'applyreject'.
> 
> The applyreject merge strategy is a two head merge strategy which performs
> the merge by obtaining the diff between the common base and the branch
> being merged and applies it to the current branch using git-apply --reject.
> Consequently any failures are written to .rej files, rather than using
> the RCS <<<<<<< ======= >>>>>>> format.

So, it's essentially the same as the classic resolve strategy, just handling rejects differently? I think that should be more obvious from its name, perhaps resolve-rej?

.rej files, what a nuisance to handle those... :)
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
Previous: Shawn PearceNext: Junio C Hamano
Message 2 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.