Re: [RFC] Merge strategy 'applyreject'

From: Shawn Pearce <>
Date: 2006-09-14 07:46:54
Petr Baudis <> wrote:
> Dear diary, on Wed, Sep 13, 2006 at 11:08:17PM CEST, I got a letter
> where Shawn Pearce <> said that...
> > 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?

Unfortunately.  More ideally it would be a configurable feature
of merge-recur that gets used rather than invoking the RCS merge.
This is just a quick and dirty 3 line shell script to propose
the concept.

> .rej files, what a nuisance to handle those... :)

A matter of opinion. :)

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at
Received on Thu Sep 14 07:46:56 2006

This archive was generated by hypermail 2.1.8 : 2006-09-14 07:47:37 EST