GitKraken Desktop 11.2: Merge Conflicts, Meet AI (and More Dev-Quality-of-Life Wins)
Blog post from GitKraken
GitKraken version 11.2 expands its AI capabilities with a preview feature for context-aware merge conflict resolution, offering suggested fixes, explanations, and confidence levels for individual conflict hunks while allowing users to edit or reject recommendations and add custom instructions. The release also improves Commit Explain by caching five recent results without additional token use, enables users to revert individual diff hunks rather than entire files, and adds workflow invite buttons plus avatar support for GitLab, Azure, and Bitbucket. In addition, GitKraken CLI can now run a local Model Context Protocol server that connects with AI agents such as GitHub Copilot, Cursor, and Windsurf to provide real-time repository insights, including open pull requests, stale branches, and code ownership information.
| Trend | Post Mentions | Total Month Mentions | Posts | Companies | MoM |
|---|---|---|---|---|---|
| MCP | 3 | 3,727 | 385 | 128 | -6% |
| AI Agents | 2 | 2,358 | 540 | 182 | -15% |
| AI Coding Assistant | 1 | 886 | 151 | 87 | +4% |
| Real-time | 1 | 5,309 | 1,304 | 269 | +26% |
Use this post, company, and trend context to find content marketing opportunities, perform competitive analysis, or address product feature gaps via the Plushcap MCP server or the Plushcap API.