Skip to content

Troubleshooting

Jump to bottom
Jakub Vul edited this page May 28, 2019 · 14 revisions

Problem: Your PR has unrelated changes

This most often happens if you branch off of one branch, but then create a PR into a different branch. For example, you branch off of master but then target your PR at a release-20xx.x.x branch. It happens because master and the release branch have different commits in them.

To fix this, you will rebase the release branch against master, and then rebase your branch against the release branch.

  1. git checkout master
  2. git pull
  3. git checkout release-20xx.x.x
  4. git pull
  5. git rebase origin/master
  6. git checkout your-branch
  7. git pull
  8. git rebase origin/release-20xx.x.x
  9. git push --force-with-lease

Clone this wiki locally