alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-29 20:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #16963 from jellyfin/Bond-009-mergeconflict
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
Format / format-check (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Artifact (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Bond-009
2026-05-28 23:01:33 +02:00
committed by GitHub
parent 8d544e4842 34fc8c270c
commit 0beb07c407
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pull-request-conflict.yml vendored
View File

@@ -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.'