[TO BE MERGED 6/17] Adds AI conflict resolution and revert hunk features #43
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduces a preview feature for resolving merge conflicts using AI, offering context-aware suggestions and explanations. Allows users to customize conflict resolution prompts and provides a confidence level for each suggested change.
Adds documentation explaining the "Revert Hunks" feature in GitKraken's diff view, which allows users to revert specific blocks of changes. This includes adding new images to illustrate the feature.
Extends the profile avatar documentation to include support for GitHub Enterprise Server, GitLab, GitLab Self-Managed, Azure DevOps, and Bitbucket. Clarifies that the avatar will match the profile on these services if connected.
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.
Adds documentation for organization-wide GitKraken AI administration, including how to disable AI, restrict model access, and set up API keys.
Adds a notification about MCP support in the GitKraken CLI. Also informs users about the upcoming end of support for older Linux distributions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds documentation for:
Also updates profile avatar documentation to include additional integrations.