git add .
git commit -m "test commit "
git fetch origin master
git rebase origin/master
git push origin master
有冲突时,解决冲突 然后
git add .
git rebase --continue
git push origin master
git add .
git commit -m "test commit "
git fetch origin master
git rebase origin/master
git push origin master
有冲突时,解决冲突 然后
git add .
git rebase --continue
git push origin master
转载于:https://www.cnblogs.com/liangshuang/p/8269347.html