git checkout -b branchname
- creates a new branch and switches to it
git checkout branchname
- switches to the specified branch
git merge frombranchname
- merges the specified branch into the current branch
git checkout main
git pull origin main
git checkout branchname
git merge main
- this will change your current branch to the main branch, pull down the latest changes from the remote repository, and merge the main branch into your current branch