From: Jeff King <peff@peff.net>
Date: Thu, 14 Aug 2008 20:54:47 GMT
Subject: Re: Why doesn't git-apply remove empty file
Message-ID: <20080814205447.GC25469@sigill.intra.peff.net>
In-Reply-To: <20080814202159.GD7138@leksak.fem-net>

On Thu, Aug 14, 2008 at 10:21:59PM +0200, Stephan Beyer wrote:

> Instead of generating reject files it puts conflict markers into the file.
> (If no context matches at all, then perhaps just insert them at the lines
> that the hunk header says.)
> And then declaring the files as "unmerged", so that you can see it in
> git status.

I use "git am -3" for that. Then you get conflict markers, or you can
use git-mergetool.

-Peff