git merge branch into branch command code example

Example 1: 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

Example 2: git merge branch a to branch b

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.