1. ```sh git checkout feature_branch git merge -s ours master ``` 2. ```sh git checkout master git merge feature_branch ```