https://blog.csdn.net/nrsc272420199/article/details/85555911
git checkout master
git pull
git checkout local
git rebase -i HEAD~2 //合并提交 --- 2表示合并两个
也可以
git rebase -i master
git rebase master---->解决冲突--->git rebase --continue
git checkout master
git merge local
git push
git remote add upstream
git remote -v
git fetch upstream
git branch -va
git checkout master
git merge upstream/master
阅读(736) | 评论(0) | 转发(0) |
