Remix.run Logo
spiffyk 2 hours ago

Git's "ours"/"theirs" terminology is often confusing to newcomers, especially when from a certain (incorrect, but fairly common) point of view their meaning may appear to be swapped between merge and rebase. I think in an attempt to make the terminology less confusing UIs tend to reinvent it, but they always fail miserably, ending up with the same problem, just with slightly different words.

This constant reinvention makes the situation even worse, because now the terminology is not only confusing, but also inconsistent across different tools.