无法在Gerrit中合并 [英] Cannot merge in Gerrit

问题描述

每当我向Gerrit发送评论时，如果该评论待处理一段时间，我都会在Gerrit中收到cannot merge消息.

Whenever I sent a review to Gerrit and if the review is pending for some time, I am getting cannot merge message in Gerrit.

我了解它的到来，因为其他人会更改相同的文件并在我之前传送.我正在尝试以下解决方法来解决我的问题.

I understood its coming because somebody else would have changed same file/files and delivered before me. I am trying below workaround to solve my issue.

1. 放弃当前的评论.
2. 创建一个新的本地分支，拉动
3. 用樱桃从旧分支中提取我的提交并发送给gerrit

这可行，但是评论将评论我所拥有的任何内容，不再可用，并且我的审阅者很难再次检查它.

This works but the review comments whatever I had would no longer be available and it is difficult for my reviewer to check it again.

我正在寻找一种从当前评论中删除cannot merge的方法.谢谢！

I am looking for a way to remove cannot merge from current review. Thanks!

推荐答案

您无需放弃Gerrit上的当前更改即可解决无法合并"的问题.您需要做的只是:

You do NOT need to abandon the current change on Gerrit to solve the "cannot merge" issue. All you need to do is:

1. 更新本地存储库(git获取)
2. 运行手动变基(git rebase)
3. 解决冲突(git mergetool，git rebase --continue)
4. 提交(修改)结果(git commit --amend)
5. 将新补丁集推送到Gerrit(git push)

这篇关于无法在Gerrit中合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！