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