2006-Nov-13

Trying to update my git for Xorg keeps failing with:

fatal: Entry 'configure.ac' not uptodate. Cannot merge.
Nope.
...
git-read-tree: fatal: Entry 'configure.ac' not uptodate. Cannot merge.

No merge strategy handled the merge.

I did have that file patched but no okay to commit upstream yet. So I did: "git checkout -f". The "-f" means force a re-read for everything. I also noticed it deleted a bunch of files. Aaaagghh -- that appeared to deleted all my custom changes that I had not yet committed. (What should I have done? 16/Aug/2007 -- Looks like "git checkout -m" to merge works.) Luckily I had saved the output of "git diff" before that.