Merge pull request #16142 from LabNConsulting/chopps/fix-conflict-wor…

…kflow ci: only run conflict check on pull-requests
FRRouting · Jun 2, 2024 · 41eb068 · 41eb068
2 parents aeab88f + 7b76c8f
commit 41eb068
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -1,9 +1,8 @@
 name: Add a conflict label if PR needs to rebase
 
 on:
-  push:
   pull_request_target:
-    types: [synchronize]
+    types: [opened, reopened, synchronize]
 
 jobs:
   conflicts: