Skip to content

Commit

Permalink
Chore: merge conflict labeler
Browse files Browse the repository at this point in the history
  • Loading branch information
Bizzonium committed Nov 1, 2022
1 parent 8c0716d commit 2c42bee
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/label_merge_conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Merge Conflict Detection'
on:
push:
branches:
- master220
jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: 'Merge Conflict'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WAIT_MS: 10000

0 comments on commit 2c42bee

Please sign in to comment.