The base for this-branch
is not develop
and we need to rebase onto develop once old-parent-branch
(in the PR above) has been merged. This way history is kept clean and consistent. After re-basing, update the base branch for this PR to be develop
and delete this snippet.
git checkout develop
git pull
git rebase --onto develop <old-parent-branch> <this-branch>
git push --force
Make sure you are aware of the ramifications of using
git push --force