Rebasing a pull request

You may find that your pull request (PR) is out-of-date and needs to be rebased. This can happen for several reasons:

  • Files modified in your PR are in conflict with changes which have already been merged.
  • Your PR is old enough that significant changes to automated test infrastructure have occurred.

Rebasing the branch used to create your PR will resolve both of these issues.

Configuring your remotes

Before you can rebase your PR, you need to make sure you have the proper remotes configured.Assuming you cloned your fork in the usual fashion, the origin remote will point to your fork:

  1. $ git remote -v
  2. origin  [email protected]:YOUR_GITHUB_USERNAME/ansible.git (fetch)
  3. origin  [email protected]:YOUR_GITHUB_USERNAME/ansible.git (push)

However, you also need to add a remote which points to the upstream repository:

  1. $ git remote add upstream https://github.com/ansible/ansible.git

Which should leave you with the following remotes:

  1. $ git remote -v
  2. origin  [email protected]:YOUR_GITHUB_USERNAME/ansible.git (fetch)
  3. origin  [email protected]:YOUR_GITHUB_USERNAME/ansible.git (push)
  4. upstream        https://github.com/ansible/ansible.git (fetch)
  5. upstream        https://github.com/ansible/ansible.git (push)

Checking the status of your branch should show you’re up-to-date with your fork at the origin remote:

  1. $ git status
  2. On branch YOUR_BRANCH
  3. Your branch is up-to-date with 'origin/YOUR_BRANCH'.
  4. nothing to commit, working tree clean

Rebasing your branch

Once you have an upstream remote configured, you can rebase the branch for your PR:

  1. $ git pull --rebase upstream devel

This will replay the changes in your branch on top of the changes made in the upstream devel branch.If there are merge conflicts, you will be prompted to resolve those before you can continue.

Once you’ve rebased, the status of your branch will have changed:

  1. $ git status
  2. On branch YOUR_BRANCH
  3. Your branch and 'origin/YOUR_BRANCH' have diverged,
  4. and have 4 and 1 different commits each, respectively.
  5.   (use "git pull" to merge the remote branch into yours)
  6. nothing to commit, working tree clean

Don’t worry, this is normal after a rebase. You should ignore the git status instructions to use git pull.We’ll cover what to do next in the following section.

Updating your pull request

Now that you’ve rebased your branch, you need to push your changes to GitHub to update your PR.

Since rebasing re-writes git history, you will need to use a force push:

  1. $ git push --force-with-lease

Your PR on GitHub has now been updated. This will automatically trigger testing of your changes.You should check in on the status of your PR after tests have completed to see if further changes are required.

Getting help rebasing

For help with rebasing your PR, or other development related questions, join us on our #ansible-devel IRC chat channelon freenode.net.

See also