merge branch to branch

//Make sure you are in your branch. Develop is a a branch in this case

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
//Move to branch again to work
git checkout master
git merge new-branch
git push# merge two branches
1] you should be on MainBranch -- git checkout MainBranch
2] then run merge command -- git merge SubBranch