Rebase¶

https://github.com/openedx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

fetch latest version of upstream master¶

git fetch upstream

find hash of commit which is base of my-branch¶

git merge-base my-branch upstream/master # will return a commit hash

merge commits by rebasing the pr branch¶

git rebase -i <hash>

perform a rebase¶

git rebase upstream/master
# resolve conflicts and
git rebase --continue
# push the changes
git push -f