4 ms·
Bold move to enable the "ours" merge strategy by default! I presume this is a typo for the "-Xours" merge option to `ort` or `recursive`, but that still seems p
by Smaug123 3y ago
Bold move to enable the "ours" merge strategy by default! I presume this is a typo for the "-Xours" merge option to `ort` or `recursive`, but that still seems pretty brave.
- deleted 3y ago[deleted]
- Waterluvian 3y agoA very useful flag. But as a default? That is scary…
- avidiax 3y agoIt 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 agoI've found `ort` (which I believe is now the default) to be better than `recursive` by leaps and bounds. Have you tried `ort`?