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…
With the first major update to Kaleidoscope 4, we are entering completely new territory: Kaleidoscope can now directly talk to Git. While Kaleidoscope could always integrate with Git, until now it could only show the results of a Git operation, such as git difftool and git mergetool, which was typically initiated through a Git client like Tower. For the 4.1 update, we decided to focus on the ability to display and compare multiple revisions of a file.
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.
In this article, we’ll share a few of Tower’s features that our team members love the most. Here’s what the Kaleidoscope engineers told us. If you haven’t seen our article on how Kaleidoscope and Tower make the perfect Git setup, you may want to start with that.
Developers make up the largest segment of Kaleidoscope customers. Many of you use the Git version control system to manage your source code, regardless of the programming language you may be using. The Kaleidoscope team also uses Git, and today we want to tell you about an app that most of us use on a daily basis.