From: Linus Torvalds Date: Wed, 05 Oct 2005 14:30:17 GMT Subject: Re: [PATCH] Fall back to three-way merge when applying a patch. Message-ID: In-Reply-To: <7vslvg1mcs.fsf@assigned-by-dhcp.cox.net> On Tue, 4 Oct 2005, Junio C Hamano wrote: > What is your workflow after seeing that the 47th patch among 175 > patches fails to apply? I understand you run git-applymbox > without -q, so it immediately fails and exits there. Correct. What I usually do is to just ignore the split patches, and go back to the mbox. Delete the ones that applied, and look at the one that didn't. Then I try to apply that one manually - sometimes I actually do a quick manual branch to a known version, apply and merge - and I think I might try to use the "base wiggle" patch for that. Although I would actually prefer to be able to try against a specific named release (not "all named tags" first). Quite often, the reason it doesn't apply is that I already have that patch through a git merge (or because I applied that patch earlier through another person), in which case I don't even try to merge it, I just delete that email too, and just do "git-applymbox" again. Linus