Rostislav Svoboda schrieb: > $ git ls-tree master Project/bin/path/file.jjt > 100644 blob 8d5e24f12c37fd1a435de2d4402591f5b0c2a3cc > Project/bin/path/file.jjt > > There's a file.jjt in the repo already! But guys! I bet I'm not the > first one having this problem. Do you think it would be wise to have a > kind of a check returning > 'The file '...' ignored in the branch X is not ignored in the > branch Y (or something)' This is not only about ignored files, but untracked files. And the check is already there: git said: Untracked working tree file 'Project/bin/path/file.jjt' would be overwritten by merge. -- Hannes -- 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