diff --git a/.github/workflows/AI_to_merge_conflict.yml b/.github/workflows/AI_to_merge_conflict.yml index 5d61110d5..a3c0b0fc4 100644 --- a/.github/workflows/AI_to_merge_conflict.yml +++ b/.github/workflows/AI_to_merge_conflict.yml @@ -1,11 +1,14 @@ name: Auto Resolve Conflicts on: - pull_request: - types: [opened, synchronize, reopened] + issue_comment: + types: [created] jobs: - resolve-conflicts: + dispatch: + if: | + github.event.issue.pull_request && + startsWith(github.event.comment.body, '/run-ai') runs-on: ubuntu-latest permissions: