3 ms·
What i would love is, if the edit conflict was already baked into the language . Conflict<Implementation1, Implementation2>.
by ashoeafoot 2y ago
What i would love is, if the edit conflict was already baked into the language . Conflict<Implementation1, Implementation2>.
- GTP 2y agoWhat would be the advantage vs having an UI that clearly shows the conflict?
- ashoeafoot 2y agoIt would allow for identification of intent and reasoning over that. Is it aggregate, the people adding to the same with no overlaping elements. Is it a overlapping set, n-people contributing the same Is it a xor set where two people want to split up a implementation and go into different directions ? If one deletes and creates a new as replacement , the other continues to work on the element, that could auto map to an intent above. And if you know that you can provide much more resonable merges.