3 ms·
Show HN: JuxtaCode – native Git diff tool for macOS
I wanted to make a native Git diff tool that works "stand-alone" in the sense that you just need to point it at a repository and then you can select commits to compare and open files in a 3-way-merge tool.
I've been finding it useful to have one app I can quickly switch to for comparing branches and sorting out merge conflicts.
- swah 3y agoCan you also diff two files outside of git?
- yorim 3y agoNot yet. Definitely on my todo list, but for now focusing on getting things working correctly when using Git.
- iraizo 3y agolooks nice, just something i wouldn't use if i can't use it on any other OS. Wouldn't want to split my toolchain across different OS
- monkey_monkey 3y agoWhat's the post-beta pricing going to be?
- KMnO4 3y agoLooks 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.