.qwen/design/2026-06-23-fix-conflicts-command.md
Add a maintainer-triggered @qwen-code /resolve command for pull requests that are blocked by merge conflicts with the default branch.
The first version is intentionally conservative:
QwenLM/qwen-code.write, maintain, or admin permission.CI_DEV_BOT_PAT to push and comment.issue_comment or workflow_dispatch and resolves the target pull request.CI_BOT_PAT.eyes reaction.origin/<base>, resolves conflicts, verifies the result, commits, and writes a summary artifact.--force-with-lease against the original head SHA and comments with the conflict-resolution summary.