3 ms·

A very useful flag. But as a default? That is scary…

• avidiax 3y ago
  It is still only "ours" per hunk. But yes, it could obliterate changes. On the other hand, the default merge strategy is a huge waste of developer time. There is rarely a genuine conflict. It's usually just that we want to keep both sides.
  • Smaug123 3y ago
    I've found `ort` (which I believe is now the default) to be better than `recursive` by leaps and bounds. Have you tried `ort`?