4 ms·
3-way merge has more information available to avoid some conflicts that would have to be manually resolved with the patch. Otherwise, you got the idea.
by coryrc 3y ago
3-way merge has more information available to avoid some conflicts that would have to be manually resolved with the patch. Otherwise, you got the idea.
- chx 3y ago> 3-way merge has more information available that was my question :) what information?
- coryrc 3y agoPatch lacks the diff from original commit to the commit-having-patch-applied-to. So if the name of a function referenced in the patch changed between those two, it will fail to apply, yet 3-way merge could continue. Additionally patch is very simplistic.