[SOLVED] Git updating problem

Code:

$ ./all update
+ cd /home/karbofos/games/xonotic/.
+ git config remote.origin.fetch refs/heads/*:refs/remotes/origin/*
+ git pull
Updating 0a079af..2c4a7b5
error: Untracked working tree file 'data/common-spog.pk3' would be overwritten by merge.  Aborting

me too

Yeah it's a "chicken and egg" problem with the autocrlf stuff that was committed.

I fixed it by going into .git/config in the working directory and commenting out the offending autocrlf line and then doing a pull.

Then uncommenting the line again.