Skip to content

Commit

Permalink
Add merge conflict labeler task
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsvanvelzen committed Feb 23, 2021
1 parent db935fa commit dd58aec
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/merge-conflict-labeler.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Merge conflicts labeler

on:
schedule:
- cron: '0 4 * * *'
push:

jobs:
triage:
runs-on: ubuntu-20.04
if: github.repository == 'jellyfin/jellyfin-apiclient-java'
steps:
- uses: mschilde/auto-label-merge-conflicts@v2.0
with:
CONFLICT_LABEL_NAME: merge conflict
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit dd58aec

Please sign in to comment.