Even 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 "Thei

Even 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.