SHELL

git merge main into branch

$ git checkout main
$ git pull
$ git checkout validator
$ git merge main
$ git push

git merge a branch to master/main

- git checkout master #change to master branch
- git pull origin master #update your master branch from GitHub
- git merge <branchname> -m "your message here" #merge a branch into master branch 
- git add . 
- git commit -m "final commit"
- git push origin master

git merge branch into main

You can run your tests, make sure the hotfix is what you want, and finally merge the hotfix branch back into your master branch to deploy to production. You do this with the git merge command:

$ git checkout master
$ git merge hotfix