2 ms·
diff3 is generally how the problem of a shared base with two child histories that need to be merged is handled. This works on a per file basis, so if you have m
by verdverm 4y ago
diff3 is generally how the problem of a shared base with two child histories that need to be merged is handled. This works on a per file basis, so if you have moved files or functions around, it gets more complicated.