mirror of
https://github.com/mintlify/docs.git
synced 2026-09-14 13:35:46 +08:00
9cbc439aa0
* docs: document agent merge conflict resolution for automation PRs * docs: translate merge conflict resolution section into es, fr, zh * Apply batched suggestions from code review Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com> --------- Co-authored-by: mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com> Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com>