Merge branch with _ours_ resolving conflicts

What we have:

• branch master
• branch feature

What we want:

Merge feature into master. If conflicts occurs - use master.

Solution:

git checkout master
git merge -s recursive -X ours feature