git checkout master
git pull https://gitee.com/jackie_wu123/community.git conflict
git push origin master
