on merge to master change files 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: merge master into feature branch

git checkout feature1
git merge master