Git Merge Strategy Options

This is done using the -X or --strategy-option flag. For more info, see the page on merge strategies.

# Accept all the incoming changes for conflicts
git merge something-better -X theirs

# Accept all your changes for conflicts
git merge mine-is-cooler -X ours