按此步骤基本没问题, 中间有 conflict, 需要手动解决.
,Git stash,Git pull,Git stash pop,Git add --xxx,Git commit -m "msg",Git pull,Git rebase,Git push origin HEAD:refs/for/master
来源: http://www.bubuko.com/infodetail-2986099.html