How to force a merge to succeed when there are conflicts?

Question

I\'m trying to merge a pull request that has one conflict in one file (see below). The instructions for merging the pull request are provided by github are as follows. Its i

Answer 1

If you know the changes in the current working branch is what you want, you can simply add ours flag to a git merge.

git merge -s ours master

This effectively ignores all other branch changes and guarantees the merge output is that of the current working branch.

More info and strategies here : https://www.atlassian.com/git/tutorials/using-branches/merge-strategy