👷 Detect and label merge conflicts on PRs automatically (#14045)

This commit is contained in:
Sofie Van Landeghem 2025-09-05 10:33:44 +02:00 committed by GitHub
parent 3e2dbf9169
commit bb4772c5aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 0 deletions

19
.github/workflows/detect-conflicts.yml vendored Normal file
View File

@ -0,0 +1,19 @@
name: "Conflict detector"
on:
push:
pull_request_target:
types: [synchronize]
jobs:
main:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Check if PRs have merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "conflicts"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."