我正在修复 Openstack 中的一个错误。我进行了更改，因为这是一项文档任务，所以我确实像往常一样运行了测试。我将更改提交给 Gerrit。当我正在处理另一个错误时，它从审阅者那里回来了。
我切换了分支并处理了较旧的错误。当我做 agit review时，它抛出了以下错误。
You are about to submit multiple commits. This is expected if you are
提交依赖于一个或多个审查中提交的提交。否则，您应该考虑在提交之前将您的更改压缩到一个提交中。
The outstanding commits are:
cd6bbfa (HEAD -> master) Documentation updated on panel definition using plugin files
5503c89 Merge branch 'master' of git://git.openstack.org/openstack/horizon
85b63be Change-ID:Ic0844d967d519f57246b8220f9a863faf85351d2 Closes-Bug:#1519386
74cc524 Merge branch 'master' of git://git.openstack.org/openstack/horizon
377fb7e Closes-Bug: #1597302
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel:
我想我必须做，我做了。然后 Gerrit 再次抛出这个错误。
remote: Processing changes: refs: 1, done
To ssh://annakoppad@review.openstack.org:29418/openstack/horizon.git
! [remote rejected] HEAD -> refs/publish/master/bug/1597302 (you are not allowed to upload merges)
error: failed to push some refs to 'ssh://annakoppad@review.openstack.org:29418/openstack/horizon.git'
我试图通过做一个变基来修复它。
$ git rebase -i 377fb7e
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset' interactive rebase in progress; onto 377fb7e
Last commands done (190 commands done):
pick 15909be modify the home-page info with the developer documentation
pick 5a39ad7 Update the home-page in setup.cfg
Next commands to do (137 remaining commands):
pick 21b723e Fix typo
pick 41e9d62 Remove embedded CSS
You are currently rebasing branch 'master' on '377fb7e'.
nothing to commit, working directory clean
Could not apply 5a39ad78233546a01ae3da6efd10b104231d1d8b... Update the home-page in setup.cfg
这就是我想要达到的目标。我想改回我的旧错误1597302并将其提交以进行审查并继续处理我当前的错误，即1519386
感谢任何可以帮助我的人。！