On 21 September 2013 10:03, Dr. Trigon <dr.trigon@surfeu.ch> wrote:
-----BEGIN PGP SIGNED MESSAGE-----
I get following error while using git:

> error: Your local changes to the following files would be
overwritten > by merge:
> maintenance/make_i18n_dict.py Please, commit your changes or stash
> them before you can merge. Aborting

I never did one single change to this file, so whats the point here?

I some (unclear to me how) why, a file containing $Id: ....$ was committed to the git repository - is should have been stripped to $Id$. When checking for changes, the file in your working copy is stripped (and thus contains $Id$ according to the diff instead of $Id: ...$). This is then compared to the git copy that does contain $Id: ....$, leading to a broken working copy.

I fixed it in:
https://github.com/wikimedia/pywikibot-compat/commit/dfff975cabec593af2ef4446693a436a72c6f660 

Merlijn