git checkout master
git pull https://gitee.com/simple.tcp.server/test-git.git revert-merge-12-master
git push origin master