From ab07509883cfda46a06cb8633988a0aafc944208 Mon Sep 17 00:00:00 2001 From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2026 00:28:56 +0000 Subject: [PATCH 1/3] docs: document agent merge conflict resolution for automation PRs --- automations/manage.mdx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/automations/manage.mdx b/automations/manage.mdx index 3b4444f40..ff8cb4898 100644 --- a/automations/manage.mdx +++ b/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "Manage automations" description: "Enable, disable, trigger, and delete automations from your dashboard. Configure repository, schedule, and integration triggers; context repos; and automerge." -keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation"] +keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation", "merge conflicts"] --- import GitlabAutomationSetup from '/snippets/gitlab-automation-setup.mdx'; @@ -163,6 +163,10 @@ Each result shows one of the following statuses: You can act on results directly from the list. For runs awaiting review, click **Accept** to merge the changes or **Preview** to view the changes in the editor. For failed results, click **Re-trigger** to start the run again. +### Resolve merge conflicts + +If a run's pull request conflicts with your deploy branch, clicking **Accept** opens a dialog offering to resolve the conflicts for you. Click **Resolve and merge** to have the agent merge the latest deploy branch changes into the pull request branch, resolve the conflicts, and merge the pull request automatically. The run shows as **Running** while the agent works, then changes to **Accepted** when the pull request merges. If the agent can't resolve the conflicts, resolve them manually in your repository, then click **Accept** again. + To see a run's prompt, the files it read or changed, and any pull requests, click the run's actions menu then click **View run details**. ## Continue a run in the editor From 52debb58aab3c27730f11f6d537e9e76ef85d4ed Mon Sep 17 00:00:00 2001 From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2026 00:32:15 +0000 Subject: [PATCH 2/3] docs: translate merge conflict resolution section into es, fr, zh --- es/automations/manage.mdx | 8 +++++++- fr/automations/manage.mdx | 10 ++++++++-- zh/automations/manage.mdx | 8 +++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/es/automations/manage.mdx b/es/automations/manage.mdx index c6f594ee9..f457fec8d 100644 --- a/es/automations/manage.mdx +++ b/es/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "Gestionar automatizaciones" description: "Activa, desactiva, ejecuta y elimina automatizaciones. Configura activadores de repositorio, programación e integración, contexto y automerge." -keywords: ["cron", "push", "automerge", "contexto", "instrucciones de automatización", "activador", "desactivar automatización", "activar automatización"] +keywords: ["cron", "push", "automerge", "contexto", "instrucciones de automatización", "activador", "desactivar automatización", "activar automatización", "conflictos de fusión"] --- import GitlabAutomationSetup from '/snippets/es/gitlab-automation-setup.mdx'; @@ -196,6 +196,12 @@ Cada resultado muestra uno de los siguientes estados: Puedes actuar sobre los resultados directamente desde la lista. Para las ejecuciones pendientes de revisión, haz clic en **Accept** para fusionar los cambios o en **Preview** para ver los cambios en el editor. Para los resultados fallidos, haz clic en **Re-trigger** para iniciar la ejecución de nuevo. +
+### Resolver conflictos de fusión +
+ +Si la pull request de una ejecución tiene conflictos con tu rama de despliegue, al hacer clic en **Accept** se abre un cuadro de diálogo que ofrece resolver los conflictos por ti. Haz clic en **Resolve and merge** para que el agente fusione los últimos cambios de la rama de despliegue en la rama de la pull request, resuelva los conflictos y fusione la pull request automáticamente. La ejecución se muestra como **Running** mientras el agente trabaja y cambia a **Accepted** cuando la pull request se fusiona. Si el agente no puede resolver los conflictos, resuélvelos manualmente en tu repositorio y haz clic en **Accept** de nuevo. + Para ver el prompt de una ejecución, los archivos que leyó o modificó y cualquier pull request, haz clic en el menú de acciones de la ejecución y luego haz clic en **View run details**.
diff --git a/fr/automations/manage.mdx b/fr/automations/manage.mdx index 87412e188..05ba4195b 100644 --- a/fr/automations/manage.mdx +++ b/fr/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "Gérer les automatisations" -description: "Activez, désactivez, déclenchez ou supprimez des automatisations, et configurez leurs déclencheurs de dépôt, calendrier et intégration, contexte et automerge." -keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation"] +description: "Activez, désactivez, déclenchez et supprimez des automatisations. Configurez les déclencheurs de dépôt, de calendrier et d'intégration, et l'automerge." +keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation", "merge conflicts"] --- import GitlabAutomationSetup from '/snippets/fr/gitlab-automation-setup.mdx'; @@ -196,6 +196,12 @@ Chaque résultat affiche l'un des statuts suivants : Vous pouvez agir sur les résultats directement depuis la liste. Pour les exécutions en attente de relecture, cliquez sur **Accept** pour fusionner les modifications ou sur **Preview** pour voir les modifications dans l'éditeur. Pour les résultats en échec, cliquez sur **Re-trigger** pour relancer l'exécution. +
+ ### Résoudre les conflits de fusion +
+ +Si la pull request d'une exécution entre en conflit avec votre branche de déploiement, cliquer sur **Accept** ouvre une boîte de dialogue proposant de résoudre les conflits pour vous. Cliquez sur **Resolve and merge** pour que l'agent fusionne les derniers changements de la branche de déploiement dans la branche de la pull request, résolve les conflits et fusionne automatiquement la pull request. L'exécution s'affiche comme **Running** pendant que l'agent travaille, puis passe à **Accepted** une fois la pull request fusionnée. Si l'agent ne peut pas résoudre les conflits, résolvez-les manuellement dans votre dépôt, puis cliquez à nouveau sur **Accept**. + Pour voir le prompt d'une exécution, les fichiers qu'elle a lus ou modifiés, et toute pull request, cliquez sur le menu d'actions de l'exécution, puis cliquez sur **View run details**.
diff --git a/zh/automations/manage.mdx b/zh/automations/manage.mdx index dea43d215..ffc514024 100644 --- a/zh/automations/manage.mdx +++ b/zh/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "管理自动化" description: "从控制台启用、禁用、触发和删除自动化。配置仓库、计划和集成触发器、上下文仓库及 automerge。" -keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation"] +keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation", "merge conflicts"] --- import GitlabAutomationSetup from '/snippets/zh/gitlab-automation-setup.mdx'; @@ -196,6 +196,12 @@ import GitlabAutomationSetup from '/snippets/zh/gitlab-automation-setup.mdx'; 你可以直接在列表中对结果执行操作。对于等待审查的运行，点击 **Accept** 合并更改，或点击 **Preview** 在编辑器中查看更改。对于失败的结果，点击 **Re-trigger** 重新开始运行。 +
+ ### 解决合并冲突 +
+ +如果某次运行的 pull request 与你的部署分支存在冲突，点击 **Accept** 会打开一个对话框，提供为你解决冲突的选项。点击 **Resolve and merge**，agent 会将部署分支的最新更改合并到 pull request 分支、解决冲突并自动合并该 pull request。agent 工作期间，运行显示为 **Running**；pull request 合并后变为 **Accepted**。如果 agent 无法解决冲突，请在你的仓库中手动解决冲突，然后再次点击 **Accept**。 + 要查看某次运行的提示词、读取或更改的文件，以及任何 pull request，请点击该运行的 操作菜单，然后点击 **View run details**。
From bb16a9ebaaba5f05d493354ad0e48fb861343de0 Mon Sep 17 00:00:00 2001 From: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> Date: Wed, 9 Sep 2026 16:55:56 -0700 Subject: [PATCH 3/3] Apply batched suggestions from code review Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> --- automations/manage.mdx | 6 ++++-- es/automations/manage.mdx | 2 +- fr/automations/manage.mdx | 2 +- zh/automations/manage.mdx | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/automations/manage.mdx b/automations/manage.mdx index ff8cb4898..abb61bc0f 100644 --- a/automations/manage.mdx +++ b/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "Manage automations" description: "Enable, disable, trigger, and delete automations from your dashboard. Configure repository, schedule, and integration triggers; context repos; and automerge." -keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation", "merge conflicts"] +keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation"] --- import GitlabAutomationSetup from '/snippets/gitlab-automation-setup.mdx'; @@ -165,7 +165,9 @@ You can act on results directly from the list. For runs awaiting review, click * ### Resolve merge conflicts -If a run's pull request conflicts with your deploy branch, clicking **Accept** opens a dialog offering to resolve the conflicts for you. Click **Resolve and merge** to have the agent merge the latest deploy branch changes into the pull request branch, resolve the conflicts, and merge the pull request automatically. The run shows as **Running** while the agent works, then changes to **Accepted** when the pull request merges. If the agent can't resolve the conflicts, resolve them manually in your repository, then click **Accept** again. +If a run's pull request conflicts with your deploy branch, the agent prompts you to resolve the conflicts when you click **Accept** for an automation run. + +Click **Resolve and merge** to have the agent merge the latest deploy branch changes into the pull request branch, resolve the conflicts, and merge the pull request automatically. If the agent can't resolve the conflicts, resolve them manually in your repository, then click **Accept**. To see a run's prompt, the files it read or changed, and any pull requests, click the run's actions menu then click **View run details**. diff --git a/es/automations/manage.mdx b/es/automations/manage.mdx index f457fec8d..3c495cabf 100644 --- a/es/automations/manage.mdx +++ b/es/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "Gestionar automatizaciones" description: "Activa, desactiva, ejecuta y elimina automatizaciones. Configura activadores de repositorio, programación e integración, contexto y automerge." -keywords: ["cron", "push", "automerge", "contexto", "instrucciones de automatización", "activador", "desactivar automatización", "activar automatización", "conflictos de fusión"] +keywords: ["cron", "push", "automerge", "contexto", "instrucciones de automatización", "activador", "desactivar automatización", "activar automatización"] --- import GitlabAutomationSetup from '/snippets/es/gitlab-automation-setup.mdx'; diff --git a/fr/automations/manage.mdx b/fr/automations/manage.mdx index 05ba4195b..e3c1f427b 100644 --- a/fr/automations/manage.mdx +++ b/fr/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "Gérer les automatisations" description: "Activez, désactivez, déclenchez et supprimez des automatisations. Configurez les déclencheurs de dépôt, de calendrier et d'intégration, et l'automerge." -keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation", "merge conflicts"] +keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation"] --- import GitlabAutomationSetup from '/snippets/fr/gitlab-automation-setup.mdx'; diff --git a/zh/automations/manage.mdx b/zh/automations/manage.mdx index ffc514024..bb9f9fdb0 100644 --- a/zh/automations/manage.mdx +++ b/zh/automations/manage.mdx @@ -1,7 +1,7 @@ --- title: "管理自动化" description: "从控制台启用、禁用、触发和删除自动化。配置仓库、计划和集成触发器、上下文仓库及 automerge。" -keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation", "merge conflicts"] +keywords: ["cron", "push", "automerge", "context", "automation instructions", "trigger", "disable automation", "enable automation"] --- import GitlabAutomationSetup from '/snippets/zh/gitlab-automation-setup.mdx';