git remote add upstream 上游地址
git fetch upstream
git checkout master
git merge upstream/master
git merge upstream/master
git push origin master
git remote add upstream 上游地址
git fetch upstream
git checkout master
git merge upstream/master
git merge upstream/master
git push origin master