and
git pull origin master git reset --hard git stash git stash pop
git pull origin master
git reset --hard
git stash
git stash pop
merging into master should be done via pull request imho
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
and
git pull origin mastergit reset --hardgit stashgit stash popmerging into master should be done via pull request imho