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.
Developer
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!
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.
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.
The Benefits of a Visual Merge Tool
Merge conflicts can often be the show stopper when there’s a quick task you are try to finish up. While modern version control systems like Git and hg have much more robust merge capabilities, when…
Using Git File History from other apps
The new Git File History feature is extremely useful to quickly inspect changes to a file over time. You may find yourself in a situation where a file in your Git repository has been changed…
Text Filters in Kaleidoscope 4
Text filters reduce visual noise in a text comparison, noise that distracts from the differences you do care about. They are useful in a lot of scenarios, in particular when dealing with generated text like logs or files that contain “random” data, like timestamps or identifiers.
Code Review of Feature Branches
A common workflow in Git is to use feature branches, where work is focused on one specific task. The Changeset functionality in Kaleidoscope helps you see exactly what has been done in a feature branch.
Mac App Store and investing engineering time
Today I’d like to share some insight in what I consider a mistake I made in investing our engineering time. Running a business is hard, and there aren’t always perfect solutions or ideal situations.