The Kaleidoscope file comparison app has just rolled out an update featuring major enhancements to its merge conflict resolution capabilities. The latest version aims to simplify the Git merge conflict process, equipping users with better tools to understand code alterations.
What’s new in Kaleidoscope
Among the standout features in Kaleidoscope 5.2 is the new capability to view and compare the Base file during merges. This enhancement allows users to:
- Present the Base file as needed rather than alongside other files;
- Analyze modifications between the Base and either side A or B;
- Examine total file comparisons and access commit history.
These new comparison options can be accessed through the toolbar buttons at the bottom or via commands in the View menu. For rapid access to comprehensive comparisons, users can option-click the toolbar button. Additionally, Kaleidoscope 5.2 improves navigation within conflict and changes tracking.
For example, primary navigation actions will now take users to the next or previous conflict in a merge, while secondary navigation (for next/previous change) can be achieved by holding down the option key. New keyboard shortcuts include Command + Down Arrow for Next Conflict and Option + Command + Down Arrow for Next Change.
The updated Kaleidoscope also brings several enhancements for exploring Git history, including:
- Reviewing intermediary changes between the Base and conflicting versions;
- The Git File History view providing streamlined navigation through commit history;
- Options for users to select which changeset to open when dealing with commits that have multiple parents.
To align better with macOS standards and avoid clashes with text editing shortcuts, Kaleidoscope 5.2 has introduced several modifications to its keyboard shortcuts:
- Commands for choosing A and choosing B now require the control key;
- Navigation shortcuts have been refined to distinguish between primary (conflict) and secondary (change) actions.
For users who wish to keep using the previous shortcuts, the update offers guidance on reverting to the old settings via macOS System Preferences.
A subscription to Kaleidoscope 5 is priced at $14 per month or $96 annually (with a discounted rate). A plan for Teams is also available, while users of previous versions can upgrade for only $4 a month in the first year. More information can be found here.
Read also:
: . More.
