Gerrit重复请求被拒绝
Gerrit duplicate request rejected
我修改了一些文件,重新提交,然后输入 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'
我如何弄清楚为什么它说重复请求?我不明白为什么会这样。我试过各种方法都无济于事。
没关系。
所以我的提交 "added another test case" 与提交 "Modified a few tests" 具有相同的更改 ID。我已将更改 ID 设置为相同,以便它会显示为 gerrit 上先前提交下的补丁集。
但是 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'
我如何弄清楚为什么它说重复请求?我不明白为什么会这样。我试过各种方法都无济于事。
没关系。 所以我的提交 "added another test case" 与提交 "Modified a few tests" 具有相同的更改 ID。我已将更改 ID 设置为相同,以便它会显示为 gerrit 上先前提交下的补丁集。 但是 gerrit 似乎希望您将更改压缩为一次提交。
所以我压缩了它们,现在我没有得到重复的错误。