I always use
git stash
git pull
And It works for me
On Mon, Sep 9, 2013 at 3:56 PM, Merlijn van Deen <valhallasw(a)arctus.nl>wrote;wrote:
On 9 September 2013 12:31, <info(a)gno.de> wrote:
+1
There is a problem with changes on the working copy which are not
committed or stashed. Pulling the repo often fails with the following:
C:\pwb\compat>git pull "origin" master -v --progress
From
https://gerrit.wikimedia.org/r/pywikibot/compat
* branch master -> FETCH_HEAD
Updating f9f28e8..9fe0bc2
error: Your local changes to the following files would be overwritten by
merge:
externals/__init__.py
Please, commit your changes or stash them before you can merge.
Aborting
svn merged it automatically if there where no conficts and if there where
some conflicts I could easy solve it. Any ideas for that flow with git?
Untested, but you could try:
git stash
git pull
git stash pop
Merlijn
_______________________________________________
Pywikipedia-l mailing list
Pywikipedia-l(a)lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l