You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Adds the release notes for GitKraken Desktop version 11.2.0,
highlighting new features such as AI-powered merge conflict resolution
and hunk reverting, along with improvements and bug fixes.
Updates GitKraken Desktop release notes
Updates the current release notes to embed the YouTube video directly using an iframe instead of a link with a thumbnail.
This provides a better user experience by allowing users to watch the video directly within the release notes page.
_"Because sometimes, even your conflicts need a mediator."_
28
+
29
+
### New ✨
30
+
-**AI-powered Merge Conflict Resolution (Preview):** Quickly handle conflicts by having AI suggest a resolution.
31
+
- When viewing a conflicted file, click `Auto-resolve with AI` to generate a suggested resolution in the Output panel.
32
+
- An explanation is provided for each conflict in the file with a confidence level so you can review with ease.
33
+
-**Revert Individual Hunks from the Diff View**
34
+
- You can now revert specific hunks while viewing a diff in Hunk View mode. Selecting `Revert Hunk` will apply the inverse of that hunk’s changes to your working directory as unstaged changes.
35
+
36
+
### Improvements 🙌
37
+
- The Commit Graph and Commit Details Panel now use provider avatars for GitLab, BitBucket, and Azure repos.
38
+
- Conflict Prevention menus now show the provider avatar of the user you have a potential conflict with.
39
+
- GitKraken AI:
40
+
- Added a cache of the last 5 AI explanations to prevent unnecessary token usage and give you quick access to explanations after navigating away from the Explain panel.
41
+
- Buttons that activate GitKraken AI now have a unified look and feel.
42
+
- GitKraken Desktop will now respect AI provider configurations and security controls enforced by your organization on [GitKraken.dev](https://gitkraken.dev)
43
+
- Experimental Feature - Git Executable:
44
+
- Fully support discard changes by also supporting cases for renamed file and multi-selection of added/renamed files.
45
+
46
+
### Bug Fixes 🐛
47
+
- Fixed an issue when finishing a release or hotfix with Git Flow where changes did not merge into master after a conflict on develop.
48
+
- Fixed a crash when pressing the Generate button in SSH settings on Windows.
49
+
50
+
<br>
51
+
52
+
> GitKraken also introduced Model Context Protocol (MCP) support via the GitKraken CLI! Spin up a local MCP server and connect AI tools like GitHub Copilot, Cursor, or Windsurf to surface real‑time code insights (e.g. list PRs, clean old branches, find your code expert) directly from your GitKraken Workspace. [Learn more.](https://www.gitkraken.com/blog/introducing-gitkraken-mcp)
0 commit comments