git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brent Goodrick <bgoodr@gmail.com>
To: git@vger.kernel.org
Subject: How do I force git to forget about merging a binary file that is to  stay deleted on the target branch?
Date: Fri, 27 Mar 2009 22:26:28 -0700	[thread overview]
Message-ID: <e38bce640903272226l3facf47br9b1849bf708c3881@mail.gmail.com> (raw)

Hi,

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:

Here is what I'm left with:

,----
| $ : gitw status
| TimeSheets/Timesheet Exempt.XLS: needs merge
| # On branch home
| # Changes to be committed:
| #   (use "git reset HEAD <file>..." to unstage)
| #
| <snipped out other files I do want to commit>
| #
| # Changed but not updated:
| #   (use "git add <file>..." to update what will be committed)
| #   (use "git checkout -- <file>..." to discard changes in working directory)
| #
| #	unmerged:   TimeSheets/Timesheet Exempt.XLS
| #
| $ : gitw commit -m "merge from work"
| TimeSheets/Timesheet Exempt.XLS: needs merge
| TimeSheets/Timesheet Exempt.XLS: unmerged
(49a49bd9de154daa8ca6cff3cfb550d0dd1b4519)
| TimeSheets/Timesheet Exempt.XLS: unmerged
(8de60b8b6827ef1f80921f6d35b574a56683bfdd)
| error: Error building trees
`----

Any help anyone can provide is greatly appreciated.

Thanks,
Brent

             reply	other threads:[~2009-03-28  5:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-28  5:26 Brent Goodrick [this message]
2009-03-28 10:23 ` How do I force git to forget about merging a binary file that is to stay deleted on the target branch? Nanako Shiraishi
2009-03-28 14:29   ` Brent Goodrick
2009-03-28 12:47 ` Elijah Newren
2009-03-28 14:46   ` Brent Goodrick
2009-03-28 15:07   ` Junio C Hamano
2009-03-28 15:21     ` Brent Goodrick

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e38bce640903272226l3facf47br9b1849bf708c3881@mail.gmail.com \
    --to=bgoodr@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).