Skip to content

Commit

Permalink
Add GitHub label action for merge conflicts
Browse files Browse the repository at this point in the history
This helps to identify pull requests that have merge conflicts without
needing to check each PR individually or using some GraphQL magic.

This adds the "merge-conflict" label to conflicted PRs.

Signed-off-by: Tom Wieczorek <[email protected]>
  • Loading branch information
twz123 committed Jan 4, 2024
1 parent 016cda2 commit fd8bdaf
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/conflicts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Check for merge conflicts

on:
push:
branches:
- main
- release-*
pull_request_target:
types:
- synchronize
branches:
- main
- release-*

permissions:
contents: read
pull-requests: write

jobs:
main:
runs-on: ubuntu-latest
steps:
- name: Check for merge conflicts
uses: eps1lon/[email protected]
with:
repoToken: ${{ secrets.GITHUB_TOKEN }}
dirtyLabel: merge-conflict

0 comments on commit fd8bdaf

Please sign in to comment.