Rebasing your feature branch on main
regularly is a good idea.
I used to do it like this:
# update local copy of main
git fetch origin main:main
# rebase on local main
git rebase main
This always felt a litle off because I was worried I’d typo main:main
and mess it up.
This works just as well and feels much better to me:
# update local copy of `origin/main`
git fetch
# rebase on origin/main
git rebase origin/main