wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4437 from thornbill/add-merge-conflict-comment

Browse Source 
Add merge conflict comment
This commit is contained in:
Bill Thornton
2023-03-22 11:15:31 -04:00
committed by GitHub
parent 1c9b6005ef 67f3e8a119
commit 0d8109d0a6
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/automation.yml
+1
View File
@@ -17,4 +17,5 @@ jobs:
- uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0
with:
dirtyLabel: 'merge conflict'
commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
repoToken: ${{ secrets.JF_BOT_TOKEN }}