Merge vs Rebase Workflow

merging-vs-rebasing

Merge

To merge the updated main into a feature branch:

git checkout main
git pull
git checkout feature
git merge main

Rebase

To rebase a feature branch:

git checkout main
git pull
git checkout feature
git rebase main