From: Shawn Pearce Date: Wed, 13 Sep 2006 21:50:43 GMT Subject: Re: [RFC] Merge strategy 'applyreject' Message-ID: <20060913215043.GE30782@spearce.org> In-Reply-To: <7v1wqf789j.fsf@assigned-by-dhcp.cox.net> Junio C Hamano wrote: > 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. I'll clean it up, document it and and resubmit the patch if others want it as a top-level merge strategy. But I don't really want this as a merge strategy in its own right. I want it as part of merge-recur, so I can drop into my .git/config file: [merge-recursive] conflictFormat = rejects (for example) and not deal with the RCS merge program. This however will require some hacking in merge-recursive.c and apply.c but I think its workable. -- Shawn.