git fusionner le main dans la branche
$ git checkout main
$ git pull
$ git checkout validator
$ git merge main
$ git push
Careful Capuchin
$ git checkout main
$ git pull
$ git checkout validator
$ git merge main
$ git pushgit checkout feature1
git merge master
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
- 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