[notJim]

Step 3 can be simplified slightly be doing git fetch && git rebase origin/main. No need to check out the local main.

[blcArmadillo]

Or: git pull --rebase origin main

[rednafi]

TIL. Thank you.