Engineers often find themselves resolving difficult merge conflicts manually. Merges with conflicts need diffs. Why isn't diff3 (overview) good enough to do conflict resolution automatically? Without going into the theory, I'll go over some of the issues with
Shortcomings of Diff3
Shortcomings of Diff3
Shortcomings of Diff3
Engineers often find themselves resolving difficult merge conflicts manually. Merges with conflicts need diffs. Why isn't diff3 (overview) good enough to do conflict resolution automatically? Without going into the theory, I'll go over some of the issues with