git merge master into another branch code example

Example 1: merge master into local branch

git checkout feature1
git merge master

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