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.
When using git from the command line you need to know the difference between difftool and mergetool. This short article explains their difference.
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.
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.
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 adds news tricks to support you even better when dealing with merge conflicts, in particular Git merge conflicts.
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!
For every major release, we continue to evolve the Kaleidoscope design. Like last year, we came up with a new wallpaper. Some of us dig it so much that we are using ever since, so we want to also share it with you. Each wallpaper comes in light and dark variants to match your preferred appearance.
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.
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.
It’s been one year since Kaleidoscope 4 was released. Time to look back at our achievements and also glimpse ahead.