How to use ksdiff without admin privileges
Some users do not have admin privileges on their machine, but sill want to use ksdiff. Here are a few ways to make it work.
Integration
How to use Kaleidoscope for a merge conflict
When using git from the command line you need to know the difference between difftool and mergetool. This short article explains their difference.
Share a PDF of a Text Comparison
Sometimes it’s very convenient to share the exact changes in a body of text with a coworker who doesn’t have Kaleidoscope. Generating a PDF of a text comparison is a great way of doing that.
The kaleidoscope: URL scheme
Kaleidoscope 5.1 comes with a URL scheme, yet another new way to integrate with other apps on your Mac. Why would someone need that? Glad you asked!
How to open a Changeset from any app on macOS
Kaleidoscope 5 introduces a groundbreaking feature that allows users to effortlessly open the changeset for any Git commit. This feature comes in two distinct forms tailored to accommodate all macOS applications: one leveraging a system service and the other integrated with Kaleidoscope Prism. Both options can be further optimized by adding a keyboard shortcut for swift execution.
Welcome Kaleidoscope 5
Today we are proudly introducing Kaleidoscope 5! This update represents another big milestone. While we had started to integrate Git over the last few releases, Kaleidoscope 5 is reaching a new level, enabling you to dig into the history of your coding projects like never before.
Why to (not) use –dir-diff with git difftool?
The topic of today sounds pretty technical, but it is one that has a great impact on your work, if you are a developer using Git. This post outlines two fundamentally different methods for examining Git changes with Kaleidoscope. An appendix illustrates how to combine your Git app of choice with either method.
Kaleidoscope 4.3 improves Git File History and Git Merges with Markdown and more
For the previous two feature releases, Kaleidoscope gained the ability to talk to git for the Git File History and the Merge Context Shelf. We now took some time to refine and add smaller bits, to increase your productivity and make Kaleidoscope more fun.
Working with temporary content, ksdiff, and Git – Kaleidoscope File Shelf, Part 2
In this second of our series about the Kaleidoscope File Shelf we will look at how to deal with content coming from the clipboard, from integrations such as the ksdiff tool, or from Git.
The Cure for Merge Madness
Following the addition of Git File History in Kaleidoscope 4.1, in this latest update we wanted to tackle merge conflicts by adding more context provided by Git. New tools enable you to understand conflicts better and thus resolve them faster.