5 ms·
How does merging have the same problem? By definition, merging only requires you to resolve the conflicts once, at the point of the merge commit.
by feanaro 3y ago
How does merging have the same problem? By definition, merging only requires you to resolve the conflicts once, at the point of the merge commit.