On 9 September 2013 12:31, <firstname.lastname@example.org> wrote:
+1There 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 merge:
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 stashgit pullgit stash popMerlijn
Pywikipedia-l mailing list