diff options
| author | Bond-009 <bond.009@outlook.com> | 2026-05-28 23:01:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-28 23:01:33 +0200 |
| commit | 0beb07c40756aca5ab6a6ba4f8494bc5147e3c2b (patch) | |
| tree | 0c8137c6921e6fb03307e77b3d0daff0eb918fcd | |
| parent | 8d544e48424d9ddbb1f97d354ed6e6a3f749cbfb (diff) | |
| parent | 34fc8c270cf849ce6dab1f425448411291e1ca2e (diff) | |
Merge pull request #16963 from jellyfin/Bond-009-mergeconflict
| -rw-r--r-- | .github/workflows/pull-request-conflict.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/pull-request-conflict.yml b/.github/workflows/pull-request-conflict.yml index 7684743bef..3f6af02a48 100644 --- a/.github/workflows/pull-request-conflict.yml +++ b/.github/workflows/pull-request-conflict.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Apply label uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 - if: ${{ github.event_name == 'push' || github.event_name == 'pull_request'}} + 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.' |