Skip to content

Commit

Permalink
Create label_merge_conflicts.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
anushbhatia authored Mar 16, 2021
1 parent 19d99dd commit e41f661
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/label_merge_conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'Check for merge conflicts'
on:
push:
branches:
- master
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 }}

0 comments on commit e41f661

Please sign in to comment.