yade-dev team mailing list archive

[Jan Stránský <honzik.stransky@xxxxxxxxx>]

Hi guys,

just not to mess up things again, I have a short question. According to the
wiki, I set
git config --global branch.autosetuprebase always
did some modification of the code, and run
git pull
with
"Please, commit your changes or stash them before you can merge.
Aborting"
result. What is the correct way to handle it?

git stash
git pull
git stash pop
git commit
git push
?

or
git commit
git pull
git push
? As I remember, there were some problems with this order..

Thanks
Jan