git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How do I force git to forget about merging a binary file that is to stay deleted on the target branch?

From
Brent Goodrick <bgoodr@gmail.com>
Date
Mar 28, 2009, 14:29 UTC
Message-ID
<e38bce640903280729u4f582a19ydaa70f619a9911e1@mail.gmail.com>
In-Reply-To
<20090328192300.6117@nanako3.lavabit.com>
On Sat, Mar 28, 2009 at 3:23 AM, Nanako Shiraishi <nanako3@lavabit.com> wrote:
> I think the standard answer is "you don't".

Thanks, but unfortunately, that won't work for me, since I have too many commits with useful history that would get lost if I started over and set up the work and home branches that are branched separately off of master. Also the "work" fileset and the "home" fileset are 80% the same; its the 20% that causes me puzzlement each time I want to merge changes made on one branch onto the other.

bg
Previous: Nanako ShiraishiNext: Elijah Newren
Message 3 of 7 in “How do I force git to forget about merging a binary file that is to stay deleted on the target branch?”
  1. Brent GoodrickMar 28, 2009
  2. Nanako ShiraishiMar 28, 2009
  3. Brent GoodrickMar 28, 2009
  4. Elijah NewrenMar 28, 2009
  5. Brent GoodrickMar 28, 2009
  6. Junio C HamanoMar 28, 2009
  7. Brent GoodrickMar 28, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.