News for hackers. Stuff that matters.

yorim

Show HN: JuxtaCode 1.0 – native Git diff tool for macOS

https://juxtacode.app

JuxtaCode lets you open a Git repository and perform diff operations such as:- browsing commit logs- comparing branches- resolving conflicts with a 3-way-merge toolSince my last Show HN 9 months ago, JuxtaCode has gained:- Syntax Highlighting- File History- Text Comparisons- UI RefreshNow that it's out of beta, it has a 14 day free trial period and is unlocked with a single purchase.Assuming...

( Read More... | no comments | 2 points | on HN )
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.
Not yet. Definitely on my todo list, but for now focusing on getting things working correctly when using Git.

Show HN: JuxtaCode – native Git diff tool for macOS

https://juxtacode.app

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.

( Read More... | 6 comments | 2 points | on HN )