What does this command do?
git merge -s ours old-feature
- Prefers our side only where hunks conflict
- Records a merge, keeping our tree as is
- Fast-forwards only if nothing conflicts
- Merges, then deletes
old-feature
The
Play Git ▸
ours strategy creates a merge commit whose tree is identical to HEAD, ignoring all changes from the other branch. -X ours is the option that only favours our side in conflicts.