From b1a61e5b9faa444874e82d5a04bf978a68f9aaa0 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Thu, 17 Apr 2025 13:14:13 +0530
Subject: [PATCH] Update AI_to_merge_conflict.yml

Signed-off-by: jeet041 <mahorjitendra@gmail.com>
---
 .github/workflows/AI_to_merge_conflict.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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: