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.
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…
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 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.
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.
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.
This article covers a few lesser known tips and tricks that can dramatically increase productivity when working with Kaleidoscope. Using ksdiff, you can integrate Kaleidoscope into any workflow that produces text or images and benefit from its comparison capabilities.
Kaleidoscope comes with a hidden gem that drives many integrations with system technologies and software programs: the ksdiff command. We’ll show you how to make the most of Kaleidoscope by harnessing the power of this gem in this two part series.
VSCode is a powerful IDE that can be used with all the world’s programming languages. The new Kaleidoscope extension for VSCode allows you to compare entire files, compare a selection of text, show git difftool results and run git mergetool.
As announced last week in Part 1 of our article focusing on JavaScript debugging, this second part shows how to take advantage of Kaleidoscope Developer Tools for Safari when working on web page content and layout.