Missing dependency in Gerrit

后端 未结 3 1170
野趣味
野趣味 2021-01-06 16:34

I had four changes in Gerrit, each depending on previous one (except first, of course). I\'ve abandoned second and third and reviewed first and fourth. Since first wasn\'t d

3条回答
  •  旧巷少年郎
    2021-01-06 16:58

    I used the answer from Magnus and did the interactive rebase and removed my previous commit but still had some merge conflicts. Then I manually updated the files to resolve the conflicts.

    Finally added the modified files, then ran "git rebase --continue" to resolve the issue.

提交回复
热议问题