-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello all!

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?

@xqt: might that be the kind of stashing issues you encounter too?

Greetings
DrTrigon
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlI9UrsACgkQAXWvBxzBrDAGDQCdHfZULyktjM3+tforfUs1/kwd
EnkAn1Jh4niupzUL2UOD9E6rCw9PKcQV
=lPpj
-----END PGP SIGNATURE-----

_______________________________________________
Pywikipedia-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l

Reply via email to