$ ./guess_the_languageGit
Git · hard · #18

What does this command do?

git merge -s ours old-feature
  1. Prefers our side only where hunks conflict
  2. Records a merge, keeping our tree as is
  3. Fast-forwards only if nothing conflicts
  4. Merges, then deletes old-feature
The 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.
Play Git ▸