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.
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.
Kaleidoscope 5.2 adds news tricks to support you even better when dealing with merge conflicts, in particular Git merge conflicts.
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.
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.