What does the `ours` merge strategy do vs the `recursive` strategy with -X ours option?

Git Hard

Git — Hard

What does the `ours` merge strategy do vs the `recursive` strategy with -X ours option?

Key points

  • `ours` ignores changes from the other branch entirely
  • `recursive -X ours` resolves conflicts by favoring the current branch
  • `ours` and `recursive -X ours` have different approaches to merging conflicting changes

Ready to go further?

Start full exam Practice more questions

Related questions