From: Junio C Hamano Date: Sat, 28 Mar 2009 15:07:24 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: <7viqltvg7n.fsf@gitster.siamese.dyndns.org> In-Reply-To: <51419b2c0903280547y1bb5664dj70e4e6aa939bd015@mail.gmail.com> Elijah Newren writes: > On Fri, Mar 27, 2009 at 11:26 PM, Brent Goodrick wrote: >> How do I commit a merge but force git to forget about merging one file >> that I don't want on the target branch, when it is binary, and when it >> was changed on the source branch, but was deleted on the target branch >> (and should stay deleted on the target branch)? >> >> The details: I am merging a "work" branch into a "home" branch.  There >> is one file called "TimeSheets/Timesheet Exempt.XLS" that is binary. >> I don't want that file on the "home" branch, but do want it on the >> "work" branch.  I had made an editing change to that file on the >> "work" branch, along with a bunch of other changes I do want to merge >> into the "home" branch. But no matter what I do, I can't force git to >> forget about that "TimeSheets/Timesheet Exempt.XLS" file. >> >> I've tried various flavors of git-checkout and git-reset to no >> avail. This is what I see at the very last before I gave up: > > You can resolve this merge conflict by running > $ git rm TimeSheets/Timesheet\ Exempt.XLS > > which will make git delete the file from your working copy and the > index, at which point you can then make a commit that does not include > this file. But is this what you really want to do? After doing such a "remove it" merge resolution at Home, wouldn't merging it back to Work remove the file?