Files
mintlify[bot] 9cbc439aa0 Update from code changes: automation PR merge conflict resolution (#7308)
* 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>
2026-09-09 16:56:11 -07:00
..