> Or are we doomed to another decade of shitty conflict resolution hacks? Conflict resolution is never going away. It's important to distinguish between syntac

> Or are we doomed to another decade of shitty conflict resolution hacks? Conflict resolution is never going away. It's important to distinguish between syntactical and semantical conflicts though, the first of which can be solved, but the other will always require manual intervention.