git pull origin master git rebase origin/master git merge origin/master git rebase --continue git push -u origin master 相关文章: