💻 Tech
Have you ever created a feature branch based on develop but it should have been based on another branch like release? You can create another branch or just use git rebase.
- Be sure your feature branch is checked out
- The rebase command:
git rebase --onto release develop feature-branch - If there are merge conflicts, resolve and stage them then continue:
git rebase --continue - Pull and push changes:
git pull --rebase(keeps commit history linear) thengit push - If your PR has some changes already in release but they appear as PR changes, merge with release then push the changes:
git merge origin/releasethengit push