I\'ve been reading about git merge -s ours strategy for a few hours. All resources I\'ve found state that it tricks Git into ignoring commits that happened before t
git merge -s ours