SHELL

git merge branch

git checkout master			# master is checked out
git pull					# update local
git merge new-feature		# merge branch new-feature into master
git push					# changes on remote. Then checkout a feature branch

merge branch to branch

git checkout master
git merge new-branch
git push

git merge branch

//this is for merging into a local branch//

// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_name

git merge branch

git status
git checkout master
git fetch 
git pull
git merge X # X is the name of the branch you want to merge into the receiving branch.

git merge branch into my branch

git checkout b				# b is checked out (b could be master for exampel)
git pull					# update local b
git merge a					# merge branch a into b
git push					# b changes on remote with merged source.