gitt merge 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

$ git checkout master
		Switched to branch 'master'
$ git merge <your brach name>