Resolve Merge Conflicts Faster with AI

GitKraken is a suite of developer tools built around Git, a popular version control system. It offers a graphical user interface (GUI) that allows developers to interact with Git repositories visually instead of relying on the command line. This simplifies complex Git workflows like resolving merge conflicts and visualizing code history, making Git more accessible and efficient for developers of all experience levels.

The GitKraken Desktop V11.2.0 release adds support for AI-powered merge conflict resolution (Preview), enabling you to quickly handle conflicts by having AI suggest a resolution. When viewing a conflicted file, click Auto-resolve with AI to generate a suggested resolution in the Output panel. An explanation is provided for each conflict in the file with a confidence level so you can review with ease. By accelerating conflict resolution, it minimizes interruptions in development workflows and helps maintain code quality, particularly in large-scale or fast-paced projects where merge conflicts are a frequent bottleneck.

To see a full list of what's new in V11.2.0, see our release notes.

GitKraken Desktop is licensed per user as an Annual license with free updates and technical support. See our GitKraken licensing page for full details.

Learn more on our GitKraken product page.