merge 2 branches in git code example
Example 1: how to merge git branch to master
git checkout master
git pull origin master
git merge test
git push origin master
Example 2: merging branches in git
git checkout master
Switched to branch 'master'
git pull
To pull changes of team members to your master
git checkout develop
git merge master
Resolve Conflicts in develop
git checkout master
git merge develop
To merge your final changes along with other changes to your master
git pull
If there were any additional changes made meanwhile
git push
To push the final master to the master repository
git checkout develop
Example 3: merge branch to branch
git checkout master
git merge new-branch
git push
Example 4: git merge branch to another branch
git checkout targetBranch
git merge sourceBranch
Example 5: merge branch to master
$ git checkout master
$ git branch new-branch
$ git checkout new-branch
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch
Example 6: merge two branches git
1] you should be on MainBranch -- git checkout MainBranch
2] then run merge command -- git merge SubBranch