I always use
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:
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
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by
Please, commit your changes or stash them before you can merge.
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 pop
Pywikipedia-l mailing list