格里特推动审查答案改变......关闭

时间:2014-03-12 15:09:22

标签: git push rebase gerrit git-review

我正在尝试发布我已经制作的提交,并且在推送之前不得不重新定义,现在我的分支是最新的但是当我做git审查时它会问一个问题:

[user]$ git review *originbranch*

**You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.**

The outstanding commits are:

c7d455d A
372b1b9 B
27dea57 C
1e600e2 D
713422e E
c84bea9 H
7e2b81a I

当我说是,结果是:

remote: Resolving deltas: 100% (223/223)
remote: Processing changes: refs: 1, done    
To ssh://gerrit.hq.md.checkpoint.com:29418/ipssvc
 ! [remote rejected] HEAD -> refs/publish/*originbranch*/CHANGE **(change 1298 closed)**
error: failed to push some refs to 'ssh://URL'

更改1298指的是更改D,它实际上已关闭,但却是变基的一部分,

帮助?

1 个答案:

答案 0 :(得分:1)

你没有正确改变。因此,git review正在尝试上传多个提交而不仅仅是您的提交。

您尝试上传多少次提交以供审核?假设只有一个(A c7d455d),并且您正在使用主分支:

git fetch
git checkout origin/master
git cherry-pick c7d455d

然后您应该可以正常上传。

如果您要上传多个提交,可以按顺序挑选它们或使用git rebase