Improve Merge Conflict Labeler

Based on the README of the action
https://github.com/eps1lon/actions-label-merge-conflict

Filters based on activity type before starting the action
This commit is contained in:
Bond-009
2026-06-03 19:29:25 +02:00
committed by GitHub
parent cf88058099
commit 857b99ce61

View File

@@ -5,18 +5,19 @@ on:
branches:
- master
pull_request_target:
issue_comment:
types: [synchronize]
permissions: {}
jobs:
label:
name: Labeling
main:
runs-on: ubuntu-latest
if: ${{ github.repository == 'jellyfin/jellyfin' && github.event.issue.pull_request }}
permissions:
contents: read
pull-requests: write
if: ${{ github.repository == 'jellyfin/jellyfin' }}
steps:
- name: Apply label
uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
with:
dirtyLabel: 'merge conflict'
commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'