Erik Sandberg, 30.05.2009: > 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. The script would have been more readable if you haven't given both the file and the branch name as well as the file content and the commit message the same string "a". Apart from that I wonder if your real repo also ignores the file 'a' although it is tracked in every branch. If so, why do you ignore it? Markus -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html