From a6d2479c76e93d1e9ea7bf88f7edd8fb3c8d703d Mon Sep 17 00:00:00 2001
From: Gauvino <68083474+Gauvino@users.noreply.github.com>
Date: Thu, 12 Oct 2023 23:35:29 +0200
Subject: [PATCH] Change name and add wf to issue

---
 .github/workflows/automation.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml
index 556bc34..2f5828d 100644
--- a/.github/workflows/automation.yml
+++ b/.github/workflows/automation.yml
@@ -1,20 +1,22 @@
-name: 'Automation'
+name: Merge Conflict Labeler
 
 on:
   push:
     branches: [ master ]
   pull_request_target:
     types: [ synchronize ]
+    issue_comment:
 
 jobs:
-  triage:
+  label:
     name: 'Merge conflict labeling'
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'tycrek/ass' }}
     steps:
       - uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
         with:
           dirtyLabel: 'merge conflict'
           commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"