Clemens Buchacher [off-list ref] writes:
By default, checkout and fast-forward merge will overwrite ignored
files. Make this behavior configurable.
I'd use this option if it gets into git.git.
I didn't follow the discussions when the feature was added, and I was
basically not aware that Git could trash my ignored files this way.
I've always thought that Git took great care not to touch untracked
files, and I found this good ...
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/