News for hackers. Stuff that matters.
Re:Show HN: JuxtaCode – native Git diff tool for macOS by yorim on Friday June 02, 2023 @06:57AM (#36163548)
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.

There are no comments on this comment yet.