Kaleidoscope, the acclaimed tool for file comparison and merging, has rolled out an update that enhances its features for resolving merge conflicts. The latest version boasts new refinements designed to make handling Git merge conflicts easier, while offering users a clearer view of code changes.
What’s new in Kaleidoscope
A standout feature in Kaleidoscope 5.2 is the capability to view and compare the Base file during merges. This enhancement allows users to:
- Reveal the Base file as needed, rather than presenting it alongside all other files;
- Examine alterations between the Base and either side A or B;
- Review complete file comparisons and analyze commit history.
These new comparison options are accessible via buttons located in the bottom toolbar or through commands in the View menu. For expedited access to full comparisons, users can option-click the toolbar button. The navigation system for handling conflicts and changes has also been improved in Kaleidoscope 5.2.
For example, primary navigation commands now move to the next or previous conflict in a merge, while secondary commands (for navigating next/previous changes) are activated by holding the option key. Additionally, new keyboard shortcuts have been added, including Command + Down Arrow for Next Conflict and Option + Command + Down Arrow for Next Change.
When delving into Git history, the newest release of Kaleidoscope also brings enhancements such as:
- Examine intermediary changes between the Base and the conflicting versions;
- The Git File History view enables simplified navigation through commit history;
- For commits with multiple parents, users can now select which changeset to view.
To ensure alignment with macOS standards and minimize conflicts with text editing shortcuts, Kaleidoscope 5.2 introduces several adjustments to its keyboard shortcuts:
- Choose A and Choose B commands now require the control key;
- Navigation shortcuts have been modified to differentiate between primary (conflict) and secondary (change) actions.
For those who prefer the previous keyboard shortcuts, this update includes instructions for reverting back using macOS System Settings.
A subscription for Kaleidoscope 5 is priced at $14 per month or $96 annually (with a discount available). There’s also a Teams subscription, and users of earlier versions can upgrade for just $4 a month during the first year. Further details can be found here.
Read also:
FTC: We use income earning auto affiliate links. More.
