git checkout master
git pull https://gitee.com/liuqinfei/ceph.git fix_conflicts_of_architectures
git push origin master