Skip to content

Merge

Keyboard Shortcut Updates in Kaleidoscope 5.2

  • Florian 
  • 6 min read

We received feedback about keyboard shortcuts no longer working in the text merge since the recent Kaleidoscope 5.2 release. While it’s true that we changed some shortcuts, all functionality remains intact, and we believe more consistent and usable than before. In this post, we’ll provide background on navigation and merge actions, explain the rationale behind the changes, and offer tips on how to revert to the old behavior if you still prefer that after reading.

The Cure for Merge Madness

  • catlan 
  • 5 min read

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.