Subject: Re: Re: merge removed content back into current content

From: Eric Raible <[email-masked]>
Date: Mon, 27 Sep 2010 11:31:47 -0700

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