Gerrit 重复请求被拒绝

Question

我修改了一些文件，进行了新的提交，然后输入了

git pull

然后 git 自动创建了一个新的空合并提交！ 所以我做了一个

git rebase

来尝试摆脱它。 空提交现在消失了。

但是现在当我这样做时

git review

，我明白了

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:

←[33me4b3f96←[m←[33m (←[m←[1;36mHEAD←[m←[33m -> ←[m←[1;32mmaster←[m←[33m)←[m unit tester fixes
←[33mbc61468←[m Addded test cases to ...
←[33me21d8c7←[m Added test cases to the 
←[33ma8d2919←[m added another test case
←[33m938ef4f←[m Modified a few tests
←[33mbee5ba1←[m FA initial

Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Resolving deltas: 100% (38/38)
remote: Processing changes: refs: 1, done
remote: (W) bc61468: commit subject >65 characters; use shorter first paragraph
remote: (W) bc61468: commit message lines >70 characters; manually wrap lines
To ssh://[email protected]:29418/IM
 ! [remote rejected] HEAD -> refs/publish/master (duplicate request)
error: failed to push some refs to 'ssh://[email protected]:29418/IM'

如何找出为什么显示重复请求？我不明白为什么会这样。我尝试了各种方法都无济于事。

Answer 1

没关系。 因此，我的提交“添加了另一个测试用例”与提交“修改了一些测试”具有相同的更改 ID。我将更改 ID 设置为相同，以便它在 gerrit 上的上一次提交下显示为补丁集。 但 gerrit 似乎希望您将更改压缩为一次提交。

所以我把它们压扁了，现在我不会再出现重复的错误了。

Answer 2

我有同样的gerrit错误，但我的问题是我错误地进行了两次cherry-pick（具有相同的更改ID），所以我取消了最后一个并再次成功推送