gerrit 解决冲突

$ git fetch origin
…
From ssh://gerrit.zte.com.cn:29418/Power-RD-Projects/zxdupa-pmsc
   5194bb5..6c0f4cc  master     -> origin/master
$ git rebase -i origin/master
…When you have resolved this problem, run "git rebase --continue“.…
$ git status

$ vi gerrt.test.yang.an.txt
$ git add gerrt.test.yang.an.txt
$ git rebase –continue
…
Successfully rebased and updated detached HEAD.
$ git push origin HEAD:refs/for/master
Counting objects: 3, done.
 To ssh://gerrit.zte.com.cn:29418/Power-RD-Projects/zxdupa-pmsc
 * [new branch]      HEAD -> refs/for/master