David Mandelberg <david@xxxxxxxxxxxxxx> writes: > It seems that git is overwriting my local files on merge if they're in > .gitignore. See command transcript below. I searched `git help config` > and Google, but I couldn't find any way to prevent it. Am I missing > something? (The reason I care about ignored files is that I'm using > git with a working directory of $HOME to manage my dotfiles, and most > files in my $HOME are not tracked by git but are still important.) The .gitignore file is to list "ignored and expendable" class of files; there is no "ignored but precious class" in Git.
