Gerrit副本请求被拒绝



我修改了一些文件,做了一个新的提交,然后输入了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://jkl@review-thing.bo.com:29418/IM
 ! [remote rejected] HEAD -> refs/publish/master (duplicate request)
error: failed to push some refs to 'ssh://jkl@review-thing.bo.com:29418/IM'

我怎么知道为什么它说重复请求?我不明白为什么会这样。

没关系。所以我的提交"添加了另一个测试用例"与提交"修改了一些测试"具有相同的更改ID。我已经使更改ID相同,因此它将在gerrit上的前一次提交下显示为补丁集。但是gerrit似乎想让你把这些更改压缩到一次提交中。

我把它们压扁了,这样就不会出现重复的错误了。

相关内容

最新更新