I can't recommend these enough! Kaleidoscope also has terrific image diffing capabilities which is wonderful when you are working on frontend related things.
Kaleidoscope kaleidoscope.app/ is the prettiest and most diverse git/merge diff tool I have ever tried. It does such a good job at handling my conflicts for me, that I rarely have to resolve anything manually and it also supports multiple ways of displaying the conflict.
ALT Kaleidoscope 6: Kaleidoscope has been growing on me as a Git helper tool (vs. specifically to compare two files) because I can quickly drag and drop the current file from BBEdit onto Kaleidoscope’s Dock icon to browse its commit history. – Michael Tsai, https://mjtsai.com/blog/2025/05/28/kaleidoscope-6/
💬 Customer love for Kaleidoscope 6.1: “This is a game-changer! Being able to edit either side of a diff directly in my preferred editor and having Kaleidoscope automatically refresh is such a smooth experience.”
Another feature-packed release is here with Kaleidoscope 6.1! 🚀
Now you can initiate editing of text comparisons directly from Kaleidoscope, conveniently send content from @raycast to Kaleidoscope, and use Kaleidoscope as the diff and merge tool for Jujutsu (jj). Enjoy! 🔥
Apparently, after disappointing sales, Apple’s new strategy is to appeal to headbangers—because nothing boosts revenue like customers headbanging their $3,500 headset into oblivion and rushing to buy another one.
It's a great honor to once again be included in Brett's Favorite macOS Apps this year, alongside some of our own heroes. Thank you @ttscoff for the recognition! 🙌
ALT I swear by Kaleidoscope for all of my “diffing” needs. Whether I’m comparing versions of a file, multiple directories, Git merge conflicts, Git history, or anything I need to see the changes in (even images), Kaleidoscope offers a very Mac-assed experience with smooth edges. It’s not cheap, and you’ll know if you need it. And if you do, you’ll love it.
Our latest update has been featured on 9to5Mac! 🎉 Thx, @filipeesposito and team. Dive into how Kaleidoscope takes merge conflict resolution to the next level. 🔗 Check out the write-up here: 9to5mac.com/2024/11/29/kalei…
⌨️ We just published a new blog post detailing the recent changes to Keyboard Shortcuts for merges in Kaleidoscope! 👉🏼 blog.kaleidoscope.app/2024/1…
We’d love to hear your thoughts! Feel free to reach out via hello@kaleidoscope.app for a deeper discussion. Happy merging!
After Apple's big week of Mac announcements, we’re turning the spotlight to what truly matters for developers.
We’re thrilled to announce Kaleidoscope 5.2, packed with improvements to streamline how you resolve Git merge conflicts: blog.kaleidoscope.app/2024/1…