3 ms·
Embrace the pain. If you try to let a tool help you too much with conflicts you may end up regretting it.
by mkoubaa 5y ago
Embrace the pain. If you try to let a tool help you too much with conflicts you may end up regretting it.
- jlkuester7 5y agoI fail to see how "embracing the pain" could be preferable to making more informed decisions (like knowing what the "merged common ancestor" looked like). We are not talking about some magical button that uses "AI" to resolve the conflicts for you. diff3 just gives you more context about the conflict so you can make a more informed decision....