Re: [Pywikipedia-l] GIT stashing issue

On 21 September 2013 10:03, Dr. Trigon &lt;dr.trigon(a)surfeu.ch <mailto:dr.trigon@surfeu.ch>> wrote: -----BEGIN PGP SIGNED MESSAGE----- I get following error while using git: overwritten > by merge: 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/dfff975cabec593af2ef44… Merlijn _______________________________________________ Pywikipedia-l mailing list Pywikipedia-l(a)lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l