3 ms·
Looks like this uses the ours/theirs terminology. I really dislike that and it’s the main reason I ended up abandoning Sublime Merge. It just doesn’t make sense
by KMnO4 3y ago
Looks like this uses the ours/theirs terminology. I really dislike that and it’s the main reason I ended up abandoning Sublime Merge. It just doesn’t make sense to me and the definition of ours/theirs seems to switch depending on which command you’re running.
- yorim 3y agoEven having worked on JuxtaCode, I have to stop and think about how each term applies depending on the situation. But I find that by sprinkling "Ours" and "Theirs" badges throughout the UI, including the commit graph, it helps me keep track of what each term means in the current context. But I get that might not do it for everyone.