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:46 UTC
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
Previous: Elijah NewrenNext: Junio C Hamano
Message 5 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.