git checkout master

git pull https://gitee.com/lw19901203/graphic_graphic_2d_liuwei.git resolve_conflicts_testcase

git push origin master