2009/8/10 Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>: > Hello, > >> $ git checkout master >> error: Untracked working tree file 'Project/bin/path/file.jjt' would >> be overwritten by merge. > What is the output of > > $ git ls-files master bin/ Nothing: $ git ls-files master bin/ $ git ls-files master Project/bin/ $ git ls-files mybranch bin/ $ git ls-files mybranch Project/bin/ $ ll 'Project/bin/path/file.jjt' -rw-r--r-- 1 bost Administ 8233 May 10 2006 Project/bin/path/file.jjt $ git ls-files ''Project/bin/path/file.jjt' BTW the rule to ignore bin/ is exclusively in the .gitignore on the branch mybranch not in the master branch. Might this be the problem? Bost -- 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