-----BEGIN PGP SIGNED MESSAGE-----
I see... that should not have been happened at all - misterious git...
Thanks for solving!
On 21.09.2013 11:41, Merlijn van Deen wrote:
On 21 September 2013 10:03, Dr. Trigon
-----BEGIN PGP SIGNED MESSAGE----- I get following error while
error: Your local changes to the following files
overwritten > by merge:
maintenance/make_i18n_dict.py Please, commit your
stash them before you can merge. Aborting
I never did one single change to this file, so whats the point
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:
mailing list Pywikipedia-l(a)lists.wikimedia.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
-----END PGP SIGNATURE-----