From 678ab3f4532622211a5c3e828d0eff2d45c5bbe9 Mon Sep 17 00:00:00 2001 From: Peer Richelsen Date: Tue, 31 Oct 2023 19:43:38 +0000 Subject: [PATCH] chore: remove merge conflicts workflow (#12173) --- .github/workflows/merge-conflict.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/merge-conflict.yml diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml deleted file mode 100644 index c9f8ca5b02..0000000000 --- a/.github/workflows/merge-conflict.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Auto Comment Merge Conflicts -on: push - -permissions: - pull-requests: write - -jobs: - auto-comment-merge-conflicts: - runs-on: ubuntu-latest - steps: - - uses: codytseng/auto-comment-merge-conflicts@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - comment-body: "Hey there, there is a merge conflict, can you take a look?" - wait-ms: 3000 - max-retries: 5 - label-name: "🚨 merge conflict" - ignore-authors: dependabot,otherAuthor