From bc8b01cf7bfcb2c0d40081d83055f1b164714965 Mon Sep 17 00:00:00 2001
From: Uruk <uruknarb20@gmail.com>
Date: Tue, 12 Mar 2024 01:03:14 +0100
Subject: [PATCH 1/2] Add Merge conflict labeler to workflow

---
 .github/workflows/conflict_labeler.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/conflict_labeler.yml

diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml
new file mode 100644
index 00000000..8c2b16ce
--- /dev/null
+++ b/.github/workflows/conflict_labeler.yml
@@ -0,0 +1,23 @@
+name: Merge Conflict Labeler
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request_target:
+  issue_comment:
+
+permissions: {}
+jobs:
+  label:
+    name: Labeling
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'sct/overseerr' }}
+    steps:
+      - name: Apply label
+        uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # v2.1.0
+        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.'
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"

From 086f3f2de5ee178c6d4c44147d87996147c3c123 Mon Sep 17 00:00:00 2001
From: Gauvino <68083474+Gauvino@users.noreply.github.com>
Date: Fri, 5 Apr 2024 01:47:15 +0200
Subject: [PATCH 2/2] Update actions-label-merge-conflict to v3

---
 .github/workflows/conflict_labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml
index 8c2b16ce..43de645f 100644
--- a/.github/workflows/conflict_labeler.yml
+++ b/.github/workflows/conflict_labeler.yml
@@ -15,7 +15,7 @@ jobs:
     if: ${{ github.repository == 'sct/overseerr' }}
     steps:
       - name: Apply label
-        uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # v2.1.0
+        uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
         if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
         with:
           dirtyLabel: 'merge conflict'