Handling outdated dependencies in Gerrit

I have a review change in Merge Pending state. Change depends on another change that is outdated. Dependency has a newer version that is already merged.

I tried to use rebase button to rebase pending change that was not successful, rebasing caused conflict. So I decided to fetch pending change to local repository and rebase it to master. I resolved conflict.

  • Code review report with VSTS
  • How do you apply patch file downloaded from gerrit?
  • GitHub workflow: Should each developer have their own fork?
  • Creating reviews in gerrit
  • Code Review tools for Ruby/Rails?
  • How to obtain the details of a gerrit change which is directly submitted / merged on the server
  • After that I wanted to push it back. I got error message:

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

    Change 166 is the dependecy. So I’m not able to push back rebased version.

    What is the approppriate method to get rid of outdated dependencies?

  • What is the right way to commit/push when there are conflicts in Git or TortoiseGit?
  • Should I add web libraries as git submodules for a project?
  • Move a project to an exsisting Repo
  • Definitive recommendation for git autocrlf settings
  • git-merge-base returns only one commit
  • `git show` not working: “fatal: Path exists on disk, but not in ”
  • One Solution collect form web for “Handling outdated dependencies in Gerrit”

    Seems you’ve rebased CL#166 as well and trying to push these changes.

    Rebase you change again and use
    git rebase ... -i
    to pick the only commits you need (ie remove the line with 166).

    Git Baby is a git and github fan, let's start git clone.