Update from https://github.com/gitkraken/gkcli/commit/1bc2acaf9d50bdc2d6d37aea248dfa320042e52e

gitkraken · gitkraken · commit 2811a037c333 · 2025-08-25T15:11:16.000Z
diff --git a/docs/gk.md b/docs/gk.md
@@ -34,4 +34,4 @@ gk [flags]
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai.md b/docs/gk_ai.md
@@ -21,6 +21,7 @@ This command is integrated with Gitkraken AI and provides a convenient way to in
 * [gk ai commit](gk_ai_commit.md)	 - Use AI and create a new commit
 * [gk ai explain](gk_ai_explain.md)	 - Use AI to explain commits, branches...
 * [gk ai pr](gk_ai_pr.md)	 - Use AI to manage your PRs
+* [gk ai resolve](gk_ai_resolve.md)	 - Use AI and resolve git conflicts
 * [gk ai tokens](gk_ai_tokens.md)	 - Outputs GitKraken AI tokens used
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_changelog.md b/docs/gk_ai_changelog.md
@@ -35,4 +35,4 @@ gk ai changelog [flags]
 
 * [gk ai](gk_ai.md)	 - Use AI in the CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_commit.md b/docs/gk_ai_commit.md
@@ -24,4 +24,4 @@ gk ai commit [flags]
 
 * [gk ai](gk_ai.md)	 - Use AI in the CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_explain.md b/docs/gk_ai_explain.md
@@ -20,4 +20,4 @@ Use AI to explain commits, branches...
 * [gk ai explain branch](gk_ai_explain_branch.md)	 - Use AI to explain what changes your branch has
 * [gk ai explain commit](gk_ai_explain_commit.md)	 - Use AI to explain changes in a commit
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_explain_branch.md b/docs/gk_ai_explain_branch.md
@@ -24,4 +24,4 @@ gk ai explain branch [flags]
 
 * [gk ai explain](gk_ai_explain.md)	 - Use AI to explain commits, branches...
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_explain_commit.md b/docs/gk_ai_explain_commit.md
@@ -29,4 +29,4 @@ gk ai explain commit [flags]
 
 * [gk ai explain](gk_ai_explain.md)	 - Use AI to explain commits, branches...
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_pr.md b/docs/gk_ai_pr.md
@@ -19,4 +19,4 @@ Use this command to create, review and manage your PRs with AI.
 * [gk ai](gk_ai.md)	 - Use AI in the CLI
 * [gk ai pr create](gk_ai_pr_create.md)	 - Use AI and create a new PR
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_pr_create.md b/docs/gk_ai_pr_create.md
@@ -23,4 +23,4 @@ gk ai pr create [flags]
 
 * [gk ai pr](gk_ai_pr.md)	 - Use AI to manage your PRs
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_resolve.md b/docs/gk_ai_resolve.md
@@ -0,0 +1,35 @@
+## gk ai resolve
+
+Use AI and resolve git conflicts
+
+### Synopsis
+
+
+  Use this command to resolve conflicts in your git repository using AI.
+  It can help you solving conflicts generated by git merge or rebase operations.
+
+
+```
+gk ai resolve [flags]
+```
+
+### Examples
+
+```
+
+  gk ai resolve
+  gk ai resolve -p <REPO_PATH>
+```
+
+### Options
+
+```
+  -h, --help          help for resolve
+  -p, --path string   (Optional) Repository path
+```
+
+### SEE ALSO
+
+* [gk ai](gk_ai.md)	 - Use AI in the CLI
+
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_ai_tokens.md b/docs/gk_ai_tokens.md
@@ -22,4 +22,4 @@ gk ai tokens [flags]
 
 * [gk ai](gk_ai.md)	 - Use AI in the CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_auth.md b/docs/gk_auth.md
@@ -18,4 +18,4 @@ Authenticate with the GitKraken platform
 * [gk auth login](gk_auth_login.md)	 - Login to your GitKraken account
 * [gk auth logout](gk_auth_logout.md)	 - Logout and terminate your GitKraken CLI session
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_auth_login.md b/docs/gk_auth_login.md
@@ -21,4 +21,4 @@ gk auth login [flags]
 
 * [gk auth](gk_auth.md)	 - Authenticate with the GitKraken platform
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_auth_logout.md b/docs/gk_auth_logout.md
@@ -20,4 +20,4 @@ gk auth logout [flags]
 
 * [gk auth](gk_auth.md)	 - Authenticate with the GitKraken platform
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_completion.md b/docs/gk_completion.md
@@ -21,4 +21,4 @@ gk completion [bash|zsh|fish|powershell] [flags]
 
 * [gk](gk.md)	 - GitKraken CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_graph.md b/docs/gk_graph.md
@@ -35,4 +35,4 @@ gk graph [flags]
 
 * [gk](gk.md)	 - GitKraken CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_issue.md b/docs/gk_issue.md
@@ -20,4 +20,4 @@ This command is integrated with your provider issue tracker and provides a conve
 * [gk issue assign](gk_issue_assign.md)	 - Assign an issue to a user
 * [gk issue list](gk_issue_list.md)	 - Show list of issues
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_issue_assign.md b/docs/gk_issue_assign.md
@@ -37,4 +37,4 @@ gk issue assign [flags]
 
 * [gk issue](gk_issue.md)	 - Manage your issues
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_issue_list.md b/docs/gk_issue_list.md
@@ -28,4 +28,4 @@ gk issue list [flags]
 
 * [gk issue](gk_issue.md)	 - Manage your issues
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_mcp.md b/docs/gk_mcp.md
@@ -36,4 +36,4 @@ gk mcp --readonly
 * [gk mcp install](gk_mcp_install.md)	 - Install the GitKraken MCP server in an MCP client
 * [gk mcp uninstall](gk_mcp_uninstall.md)	 - Uninstall GitKraken MCP server
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_mcp_install.md b/docs/gk_mcp_install.md
@@ -33,4 +33,4 @@ gk mcp install <PLATFORM> --file-path
 
 * [gk mcp](gk_mcp.md)	 - Start a local MCP server for your favorite MCP client to interact with
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_mcp_uninstall.md b/docs/gk_mcp_uninstall.md
@@ -33,4 +33,4 @@ gk mcp uninstall <PLATFORM> --file-path
 
 * [gk mcp](gk_mcp.md)	 - Start a local MCP server for your favorite MCP client to interact with
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_organization.md b/docs/gk_organization.md
@@ -20,4 +20,4 @@ This command allows you to list your gitkraken organizations and set the default
 * [gk organization list](gk_organization_list.md)	 - List your Gitkraken organizations
 * [gk organization set](gk_organization_set.md)	 - Set your Gitkraken organization. It will be important when using AI functions
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_organization_list.md b/docs/gk_organization_list.md
@@ -26,4 +26,4 @@ gk organization list [flags]
 
 * [gk organization](gk_organization.md)	 - Manage your Gitkraken organizations
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_organization_set.md b/docs/gk_organization_set.md
@@ -26,4 +26,4 @@ gk organization set [flags]
 
 * [gk organization](gk_organization.md)	 - Manage your Gitkraken organizations
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_provider.md b/docs/gk_provider.md
@@ -23,4 +23,4 @@ Current issue providers available: jira
 * [gk provider remove](gk_provider_remove.md)	 - Remove a git provider token
 * [gk provider set](gk_provider_set.md)	 - Set your default providers
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_provider_add.md b/docs/gk_provider_add.md
@@ -33,4 +33,4 @@ gk provider add [flags]
 
 * [gk provider](gk_provider.md)	 - Add or remove provider tokens
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_provider_list.md b/docs/gk_provider_list.md
@@ -27,4 +27,4 @@ gk provider list [flags]
 
 * [gk provider](gk_provider.md)	 - Add or remove provider tokens
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_provider_remove.md b/docs/gk_provider_remove.md
@@ -29,4 +29,4 @@ gk provider remove [flags]
 
 * [gk provider](gk_provider.md)	 - Add or remove provider tokens
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_provider_set.md b/docs/gk_provider_set.md
@@ -30,4 +30,4 @@ gk provider set [flags]
 
 * [gk provider](gk_provider.md)	 - Add or remove provider tokens
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_setup.md b/docs/gk_setup.md
@@ -16,4 +16,4 @@ gk setup [flags]
 
 * [gk](gk.md)	 - GitKraken CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_version.md b/docs/gk_version.md
@@ -20,4 +20,4 @@ gk version [flags]
 
 * [gk](gk.md)	 - GitKraken CLI
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work.md b/docs/gk_work.md
@@ -30,4 +30,4 @@ starting work on code, committing changes, PR management, and more.
 * [gk work start](gk_work_start.md)	 - Start a new work item
 * [gk work update](gk_work_update.md)	 - <Not implemented yet>
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_add.md b/docs/gk_work_add.md
@@ -29,4 +29,4 @@ gk work add [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_commit.md b/docs/gk_work_commit.md
@@ -32,4 +32,4 @@ gk work commit [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_end.md b/docs/gk_work_end.md
@@ -31,4 +31,4 @@ gk work end [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_info.md b/docs/gk_work_info.md
@@ -31,4 +31,4 @@ gk work info [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_list.md b/docs/gk_work_list.md
@@ -30,4 +30,4 @@ gk work list [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_pr.md b/docs/gk_work_pr.md
@@ -22,4 +22,4 @@ Only available for github repositories.
 * [gk work pr create](gk_work_pr_create.md)	 - Create pull requests for repos ahead of master
 * [gk work pr merge](gk_work_pr_merge.md)	 - Merge existing PRs
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_pr_create.md b/docs/gk_work_pr_create.md
@@ -37,4 +37,4 @@ gk work pr create [flags]
 
 * [gk work pr](gk_work_pr.md)	 - Manage your PR
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_pr_merge.md b/docs/gk_work_pr_merge.md
@@ -28,4 +28,4 @@ gk work pr merge [flags]
 
 * [gk work pr](gk_work_pr.md)	 - Manage your PR
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_push.md b/docs/gk_work_push.md
@@ -31,4 +31,4 @@ gk work push [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_set.md b/docs/gk_work_set.md
@@ -28,4 +28,4 @@ gk work set [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_start.md b/docs/gk_work_start.md
@@ -37,4 +37,4 @@ gk work start [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_work_update.md b/docs/gk_work_update.md
@@ -20,4 +20,4 @@ gk work update [flags]
 
 * [gk work](gk_work.md)	 - Interact with your work. Alias: 'w'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace.md b/docs/gk_workspace.md
@@ -30,4 +30,4 @@ to execute operations across multiple repositories simultaneously.
 * [gk workspace unset](gk_workspace_unset.md)	 - Clear active workspace
 * [gk workspace update](gk_workspace_update.md)	 - Update a workspace
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_clone.md b/docs/gk_workspace_clone.md
@@ -28,4 +28,4 @@ gk workspace clone [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_create.md b/docs/gk_workspace_create.md
@@ -37,4 +37,4 @@ gk workspace create [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_delete.md b/docs/gk_workspace_delete.md
@@ -27,4 +27,4 @@ gk workspace delete [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_info.md b/docs/gk_workspace_info.md
@@ -31,4 +31,4 @@ gk workspace info [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_list.md b/docs/gk_workspace_list.md
@@ -29,4 +29,4 @@ gk workspace list [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_refresh.md b/docs/gk_workspace_refresh.md
@@ -35,4 +35,4 @@ gk workspace refresh [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_set.md b/docs/gk_workspace_set.md
@@ -34,4 +34,4 @@ gk workspace set [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_unset.md b/docs/gk_workspace_unset.md
@@ -26,4 +26,4 @@ gk workspace unset [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
diff --git a/docs/gk_workspace_update.md b/docs/gk_workspace_update.md
@@ -46,4 +46,4 @@ gk workspace update [flags]
 
 * [gk workspace](gk_workspace.md)	 - Interact with your workspaces. Alias: 'ws'
 
-###### Auto generated by spf13/cobra on 31-Jul-2025
+###### Auto generated by spf13/cobra on 25-Aug-2025
