git merge master into branch resolve conflicts code example Example: merge master into local branch git checkout feature1 git merge master