merge branch to branch
Closely Related Answers
xxxxxxxxxx//this is for merging into a local branch//// checkout the branch to merge INTOgit checkout master// merge local feature branch into master branchgit merge feature_branch_nameSource: Grepper
xxxxxxxxxxgit statusgit checkout mastergit fetch git pullgit merge X # X is the name of the branch you want to merge into the receiving branch.Source: phoenixnap.com
//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
Source: Grepper
Twitter 
LinkedIn