Re: [RFC] Merge strategy 'applyreject'

From: Shawn Pearce <spearce@spearce.org>
Date: Sep 13, 2006, 21:46 UTC
Message-ID: <20060913214654.GD30782@spearce.org>
In-Reply-To: <20060913211617.GJ23891@pasky.or.cz>

Petr Baudis <pasky@suse.cz> wrote:

Show 13 quoted lines

> Dear diary, on Wed, Sep 13, 2006 at 11:08:17PM CEST, I got a letter
> where Shawn Pearce <spearce@spearce.org> 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. :)

-- 
Shawn.