git checkout master
git pull https://gitee.com/orangedays/test_code.git test-conflict
git push origin master