Merging with branches...the circle of life

Because I will likely forget all of the nuances of merging with branches to the main branch...

1) Merge remote main to local:

git checkout main

git pull origin main

2) Merge main to feature branch:

git checkout feature branch

git merge main

3) Merge feature branch to main:
open pull request and merge there