Problem Statement
Which merge strategy option prefers current branch changes on conflicts?
Explanation
`-X ours` is a strategy option for the recursive strategy preferring current branch on a path-level conflict; `-s ours` discards the other tree entirely.
Practice Sets
This question appears in the following practice sets:
