command git merge branch code example

Example 1: git merge

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

Example 2: git merge local branch

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