Handling Deprecated Dependencies in Gerrit

I have a review change in a pending merge state. The change depends on another change that is outdated. The dependency has a newer version that is already merged.

I tried to use the redirect button to reinstall pending changes that were not successful, the reboot caused a conflict. So I decided to get the pending changes in the local repository and reinstall it for mastering. I resolved the conflict.

After that, I wanted to push him away. I got an error message:

! [remote rejected] HEAD -> refs/for/master (change 166 closed) 

Change 166 is a dependency. Therefore, I cannot discard the canceled version.

What is the appropriate method to get rid of deprecated dependencies?

+4
source share
1 answer

It seems that you also killed CL # 166 and tried to push these changes.

Re-add the changes and use git rebase ... -i to select only the necessary commits (i.e. delete the line with 166).

+3
source

Source: https://habr.com/ru/post/1446445/


All Articles