Git: Rebase changes from main branch


Just a note to self on how to get changes from a main branch into a feature branch via rebasing on the command-line.

# Start
git fetch origin
git rebase origin/main

# Continue after conflicts fixed and staged
git rebase --continue

# Abort if giving up
git rebase --abort