git checkout master
git pull https://gitee.com/yisu2020/test-merge.git feat/branch1
git push origin master