Skip to content

Commit

Permalink
Add pull request conflict check
Browse files Browse the repository at this point in the history
This GitHub Actions workflow will check open pull requests for merge
conflicts and comment on such requests, requesting that the author fixes
the conflict.
  • Loading branch information
lkiesow committed Apr 23, 2024
1 parent bae9c9a commit 01de3bb
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/check-merge-conflict.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Merge conflict check
on:
push:
pull_request_target:
types:
- opened
- synchronize

jobs:
main:
runs-on: ubuntu-latest
steps:
- name: Check for dirty pull requests
uses: eps1lon/actions-label-merge-conflict@releases/2.x
with:
dirtyLabel: has-conflicts
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: |
This pull request has conflicts ☹
Please resolve those so we can review the pull request.
Thanks.

0 comments on commit 01de3bb

Please sign in to comment.