this has happened now multiple times: $ cd src/clones/django $ git pull remote: Counting objects: 8, done. remote: Compressing objects: 100% (8/8), done. remote: Total 8 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (8/8), done. >From https://github.com/django/django 68ab3b1..04e7c7d stable/1.7.x -> origin/stable/1.7.x Updating f0d3dd4..d63ac5b error: Your local changes to the following files would be overwritten by merge: django/core/context_processors.py django/db/backends/postgresql_psycopg2/introspection.py Please, commit your changes or stash them before you can merge. Aborting
both the mentioned files contain a varying number (1 and 5) (<^@> 0, Hex 00, Octal 000) characters. once these are removed (or the files reverted), the pull succeeds. i looked at the repo and as far as i can tell, the origin does not have these zeroes. but the strange thing is, that it happens always only with the django repo. any ideas? -f -- tower: "say position." pilot: "position."
