Update from code changes: automation PR merge conflict resolution

[mintlify]

Summary

Accepting an automation run whose pull request conflicts with the deploy branch now offers agent-driven resolution. Clicking Resolve and merge has the agent merge the latest deploy branch changes into the pull request branch, resolve the conflicts, and merge the pull request automatically. If the pull request is already mergeable, it merges directly. Failed resolutions fall back to manual conflict resolution guidance.

Triggered by https://github.com/mintlify/mint/pull/10648

Changes

• Added a "Resolve merge conflicts" subsection to /automations/manage under run history, covering the dialog, the running/accepted status flow, and the manual fallback.
• Added "merge conflicts" to the page keywords.
• Mirrored the new section and keyword into the Spanish, French, and Chinese pages.
• Shortened the French page description to fit the 160-character SEO limit.

Context

This behavior is gated by the automation-resolve-merge-conflict feature flag. Flag state isn't visible from the repo, so please merge only once the flag is enabled for users.

---

Note

Low Risk
Documentation-only updates to automation manage pages; no application or data-handling code changes.

Overview
Documents agent-assisted merge conflict resolution when accepting automation runs whose pull requests conflict with the deploy branch.

Adds a Resolve merge conflicts subsection under run history on automations/manage (and mirrored es, fr, zh pages). It explains the Accept prompt, using Resolve and merge to pull deploy-branch changes into the PR branch and merge automatically, and falling back to manual resolution in the repo if the agent cannot fix conflicts. Localized pages also note the Running → Accepted status while resolution runs, and use a resolve-merge-conflicts anchor where other sections use div IDs.

The French page description frontmatter is shortened to stay within the 160-character SEO limit.

^{Reviewed by Cursor Bugbot for commit bb16a9e. Bugbot is set up for automated code reviews on this repo. Configure here.}

[mintlify]

Preview deployment for your docs. Learn more about Mintlify Previews.

Project	Status	Preview	Updated
mintlify	🟢 Ready	View Preview	Sep 9, 2026, 12:30 AM

[mintlify]

Preview deployment for your docs. Learn more about Mintlify Previews.

Project	Status	Preview	Updated
tomee	🟡 Building	–	Sep 9, 2026, 12:29 AM

💡 Tip: Enable Automations to automatically generate PRs for you.