Cannot merge in Gerrit

前端 未结 3 1473
日久生厌
日久生厌 2021-01-30 11:48

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

3条回答
  •  长发绾君心
    2021-01-30 12:27

    Try rebase button, which can solve most cannot-merge issues. If it can find the proper commit to rebase onto by itself, it's okay. If it cannot, find the last commit of the target branch and fill in the commit blank. Sometimes you should first submit the commit, on which the cannot-merge one has dependency. If it cannot work anyhow, just abandon it and make the commit based on the latest commit.

提交回复
热议问题