Automatic conflict detection has landed in GitKraken Desktop 10.6! Get proactive alerts about potential conflicts, so you can fix them before they cause chaos. There’s more where that came from – watch our latest Changelog for all the updates!

We're excited to bring some tactical improvements to GitKraken Desktop with this 10.6 release. Automatic conflict detection will give you a heads up about potential conflicts when you check out a commit, and you can fine tune the detection to only apply to certain branches (and there's an off switch too of course). Worktrees got a few improvements in the Commit Graph and the Left Panel. Plus! We tackled yet another highly requested feature on feedback.gitkraken.com: support for custom external editors.

With the launch of GitKraken Desktop v10.5, we’re thrilled to introduce support for Git worktrees, which allow you to work on multiple branches simultaneously without affecting your primary working directory. In this workshop we walk through creating, managing, and switching between your worktrees. Plus share practical tips on how to incorporate worktrees into your existing workflows.