git fetch origin master git merge origin master
git fetch origin master git merge origin master git add . git commit -m 'your commit message' git push origin master
git fetch //then do git merge