on branch
git pull --rebase origin master
git push -f origin branch
git checkout master
git merge branch
git push
转载于:https://my.oschina.net/MinGKai/blog/144756
on branch
git pull --rebase origin master
git push -f origin branch
git checkout master
git merge branch
git push
转载于:https://my.oschina.net/MinGKai/blog/144756