New Series: Quick Tips
Today we are starting something new on the blog: a series of short articles focusing only on a single topic, typically a tip on how to make your life with Kaleidoscope more productive, or, as in today’s case, more enjoyable.
Developer
Keyboard Shortcut Updates in Kaleidoscope 5.2
We received feedback about keyboard shortcuts no longer working in the text merge since the recent Kaleidoscope 5.2 release. While it’s true that we changed some shortcuts, all functionality remains intact, and we believe more consistent and usable than before. In this post, we’ll provide background on navigation and merge actions, explain the rationale behind the changes, and offer tips on how to revert to the old behavior if you still prefer that after reading.
Kaleidoscope 5.2 eases the process of resolving merge conflicts by offering Base to A / B Comparisons, and more
Kaleidoscope 5.2 adds news tricks to support you even better when dealing with merge conflicts, in particular Git merge conflicts.
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!
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.
Kaleidoscope 4 — A Year in Review
It’s been one year since Kaleidoscope 4 was released. Time to look back at our achievements and also glimpse ahead.
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.