Use the `-s ours` strategy because we've already cherry-picked the merged commits and resolved conflicts.
Brad King