git merge后推送到远程老是报错:
Total 0 (delta 0), reused 0 (delta 0)
remote: Processing changes: refs: 1, done
To ssh://xxx@gerrit.xxx.cn:8090/xxx
! [remote rejected] HEAD -> refs/for/dev (no new changes)
error: failed to push some refs to 'ssh://xxx@gerrit.xxx.cn:8090/xxx'
解决方案:
git rebase
Cannot rebase: You have unstaged changes.//如果本地文件有更改,会让先暂存
//暂存代码
git stash
// 每次 push 前
git pull --rebase
git push origin HEAD:refs/for/master
// gerrit review
git pull
git stash pop
gerrit 不允许 merge 后提交,需使用 rebase 方式,所以本地 pull 以 rebase 方式进行,如:git pull –rebase