4 ms·
Yeah? That's awesome. Do you mean that the metadata fails to work with branches or that merging itself fails?
by xyzzyb 14y ago
Yeah? That's awesome. Do you mean that the metadata fails to work with branches or that merging itself fails?
- jeltz 14y agoThe metadata is not enough to track the merging so you get conflicts where there should be enough knowledge to avoid the conflict. If I remember correctly this happens only in some merging patterns.
- eli 14y agoIt's been around for some time now. I think 1.7 added it. I don't know if it was buggy or if we were doing something wrong, but it still caused merging disasters even though in theory it should have been able to avoid them.