Dear diary, on Wed, Sep 13, 2006 at 11:08:17PM CEST, I got a letter where Shawn Pearce <spearce@xxxxxxxxxxx> 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? .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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html