git merge should be from branch or from master code example

Example: merge master into local branch

git checkout feature1
git merge master