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

BUG: mergetool fails on gitignore:d files

From
ESErik Sandberg <mandolaerik@gmail.com>
Date
May 30, 2009, 15:30 UTC
Message-ID
<e87cdfda0905300830t6b332533g9a4298f6b8005b9e@mail.gmail.com>

If a version-controlled file is ignored by git, and a conflict arises on the file, and I use mergetool to resolve the conflict, then mergetool fails with a message like:

The following paths are ignored by one of your .gitignore files: a Use -f if you really want to add them.

The problem disappears if I edit the git-mergetool script to always pass -f to "git add", but I'm not sure if that's the right fix; I have a vague feeling that "git-update-index --add" could be more correct.

I have attached a script that reproduces the problem.
Next: Markus Heidelberg
Message 1 of 5 in “BUG: mergetool fails on gitignore:d files”
  1. Erik SandbergMay 30, 2009
  2. Markus HeidelbergMay 30, 2009
  3. Jeff KingMay 30, 2009
  4. Jeff KingJun 1, 2009
  5. Junio C HamanoJun 1, 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.