1 - git checkout master
2 - git pull (get latest changes on master)
3 - git checkout -b "{name-of-new-branch}"
1 - complete changes on your branch
2 - git merge main (attempt to merge main into your branch)
3* - git merge --abort (optional - to give up on merge)
4 - git push (push changes to github)