Clemens Buchacher <drizzd@xxxxxx> writes: > By default, checkout and fast-forward merge will overwrite ignored > files. Make this behavior configurable. Just mentionning an alternative, or complementary approach: Instead of overwritting completely a .gitignore-d file, Git could rename it, and warn the user kindly. For example: $ git merge ... Warning: existing ignored file 'foo' renamed to 'foo~' (in case foo~ already exists, it's possible to use numbered backups just like "mv --backup=existing" does for example) That could complement your patch if core.overwriteignored is a multiple-choice option instead of a Boolean: - "overwrite" => current behavior - "refuse" => your proposal - "rename" => my proposal -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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