git merge from other branch code example

Example 1: merge another branch into current

git checkout branch_name // checkout to branch you want to merge to if not in it already
git merge branch_to_merge_from

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