mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #2153 from thornbill/github-action-conflicts

Browse source 
Add github action to label PRs with merge conflicts
This commit is contained in:
Bill Thornton 2020-12-01 13:49:35 -05:00 • committed by GitHub
commit 0c5ead3e0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/merge-conflicts.yml vendored Normal file
View file

@ -0,0 +1,14 @@
name: "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 }}