Merge pull request #2594 from jellyfin/merge-conflict-label

.github/workflows/automation.yml

@@ -0,0 +1,16 @@
+name: 'Automation'
+
+on:
+  push:
+  pull_request_target:
+
+jobs:
+  triage:
+    name: 'Merge conflict labeling'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: eps1lon/actions-label-merge-conflict@v2.0.1
+        if: ${{ github.repository == 'jellyfin/jellyfin-web' }}
+        with:
+          dirtyLabel: 'merge conflict'
+          repoToken: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/merge-conflicts.yml

@@ -1,18 +0,0 @@
-name: "Merge Conflicts"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types:
-      - synchronize
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    if: github.repository == 'jellyfin/jellyfin-web'
-    steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
-        with:
-          CONFLICT_LABEL_NAME: "merge conflict"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}