From: Junio C Hamano Date: Wed, 13 Sep 2006 21:43:04 GMT Subject: Re: [RFC] Merge strategy 'applyreject' Message-ID: <7v1wqf789j.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20060913211617.GJ23891@pasky.or.cz> Petr Baudis writes: > 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? > > .rej files, what a nuisance to handle those... :) You were who asked for "apply --reject", weren't you? I am not interested in this merge strategy myself. Having said that, if it is cleanly done, I do not have much objection adding it for other people's use, at least in principle.