From: Brent Goodrick <bgoodr@gmail.com>
Date: Sat, 28 Mar 2009 14:46:29 GMT
Subject: Re: How do I force git to forget about merging a binary file that is to stay deleted on the target branch?
Message-ID: <e38bce640903280746n1cd92a3ft252f18e845abc3db@mail.gmail.com>
In-Reply-To: <51419b2c0903280547y1bb5664dj70e4e6aa939bd015@mail.gmail.com>

On Sat, Mar 28, 2009 at 5:47 AM, Elijah Newren <newren@gmail.com> wrote:
> You can resolve this merge conflict by running
> $ git rm TimeSheets/Timesheet\ Exempt.XLS

Much appreciated! That works.

Thanks for your and Nanako's help!

bg