Git Blog

Releasing the Power of Git

GitKraken Desktop 11.2: Merge Conflicts, Meet AI (and More Dev-Quality-of-Life Wins)

Jonathan Silva

June 17, 2025

We’ve been steadily building something powerful into GitKraken: AI that understands your code and your context.

In recent releases, GitKraken AI has already helped you:

Write smarter commit messages
Explain commits clearly
Polish your pull requests

Now, in version 11.2, it’s tackling one of the most frustrating parts of your day: merge conflicts.

Ready to see it in action? Check out the Youtube Tutorial below.

AI-Powered Merge Conflict Resolution

Screenshot of GitKraken Desktop showing an AI-assisted merge conflict resolution. Two conflicting versions of a YAML file are displayed side by side with the resolved output below, and an "AI Merge Summary" panel explains the resolution decisions with confidence percentages.

Next time you hit a conflict, click into the file like you normally would, but now you’ll see something new:
Auto-resolve with AI ✨

With a single click, GitKraken AI will:

Suggest a context-aware resolution
Provide a clear explanation of its logic
Include a confidence level for each chunk (or “hunk”) of conflicted code

You’re still in control. Use the suggestions, tweak them, or rewrite entirely.
Want even more? You can add custom conflict resolution instructions via Preferences > GitKraken AI.

Screenshot of the GitKraken Desktop preferences panel focused on GitKraken AI settings. The "Conflict Resolution" section shows custom instructions: "Maintain a bias toward keeping changes which reduce the total line count."

Heads up: This feature is in Preview, which means it’s live, but still evolving. Got feedback? We’re all ears.

Bonus: Commit Explain Gets Smarter

Commit Explain now caches your 5 latest results, so you can re-read them without using additional tokens. Small touch. Big efficiency.

Screenshot of GitKraken Desktop showing a commit graph with multiple commits selected and a sidebar titled "Explaining 5 commits." The AI-generated explanation summarizes changes for documentation on deleting GitKraken Desktop tags, including added images and improved formatting.

Revert Specific Hunks (No Full File Needed)

11.2 introduces the ability to revert individual hunks directly from the diff view.

Screenshot of GitKraken Desktop's Diff View showing a file named tags.md. A new section titled "Delete a Tag" is highlighted in green. A tooltip labeled "Revert Hunk" explains the button’s function: "Apply the inverse of this hunk to your working directory."

Just click the “Revert Hunk” button in Hunk View and GitKraken will drop the opposite change into your working directory.

Undoing changes just got easier and cleaner.

Easier Invites + New Avatar Support

Side-by-side comparison of the GitKraken commit graph labeled "Before" and "After." The "Before" view on the left shows a more compressed layout with minimal spacing between graph elements. The "After" view on the right highlights improved spacing and clarity in the commit graph lines and icons.

Whether you’re solo or working in a team, collaboration just got smoother:

Invite buttons added to team workflows
Avatar display now includes GitLab, Azure, and Bitbucket

Because yes, the little things matter too.

Introducing GitKraken MCP: AI Agents Just Got a Power-Up

With GitKraken CLI, you can now spin up a local Model Context Protocol (MCP) server and connect AI agents like GitHub Copilot, Cursor, or Windsurf. This opens up powerful new workflows, pull real-time code insights, like listing open PRs, identifying stale branches, or finding the expert behind a specific part of your codebase. It’s a smarter, more streamlined way to extend your GitKraken Workspace and make your AI tools truly collaborative teammates.