Merge pull request #828 from armsnyder/workflow-pr-check-conflicts

Workflows: Automate applying merge-conflict label

Author: timofurrer

.github/workflows/pr-check-conflicts.yml

@@ -0,0 +1,28 @@
+# GitHub Action reference: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+name: pr-check-conflicts
+
+on:
+  # For adding the merge-conflict label.
+  push:
+    branches:
+      - main
+      - master
+  # For removing the merge-conflict label.
+  pull_request_target:
+    types: [synchronize]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      # Docs: https://github.com/marketplace/actions/label-conflicting-pull-requests
+      - uses: eps1lon/[email protected]
+        with:
+          dirtyLabel: merge-conflict
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          commentOnDirty: 'This pull request has merge conflicts. Please rebase your branch onto `${{ github.event.repository.default_branch }}`.'
+          commentOnClean: 'Conflicts are resolved. Thank you! :grinning:'