+- Xonotic Forums (https://forums.xonotic.org)
+-- Forum: Support (https://forums.xonotic.org/forumdisplay.php?fid=3)
+--- Forum: Xonotic - Help & Troubleshooting (https://forums.xonotic.org/forumdisplay.php?fid=4)
+--- Thread: [SOLVED] Git updating problem (/showthread.php?tid=312)
Git updating problem - Karbofos - 04-19-2010
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. AbortingRE: Git updating problem - subsonik - 04-19-2010
me too
RE: Git updating problem - lectroidmarc - 04-19-2010
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.