From: Eric Raible <raible@nextest.com>
Date: Mon, 27 Sep 2010 18:31:47 GMT
Subject: Re: Re: merge removed content back into current content
Message-ID: <4CA0E313.4090501@nextest.com>
In-Reply-To: <AANLkTimxHbCktv=kaq0UfV+u1kH1Pb2LYA2Xi=qkgduW@mail.gmail.com>

On 11:59 AM, Elijah Newren wrote:

> btw, does anyone know how to force
> git apply to proceed and add conflict markers if necessary rather than
> just bailing out?

It's not quite the same, and you probably already know about it,
but there's always: git apply --reject