jellyfin/.github/workflows/pull-request-conflict.yml, branch v12.0-rc1 Unnamed repository; edit this file 'description' to name the repository. https://git.b0n.dev/jellyfin/atom?h=v12.0-rc1 2026-06-03T17:29:25Z Improve Merge Conflict Labeler 2026-06-03T17:29:25Z Bond-009 bond.009@outlook.com 2026-06-03T17:29:25Z urn:sha1:857b99ce612dd847f1f666ffe9214ea449a4e158 Based on the README of the action https://github.com/eps1lon/actions-label-merge-conflict Filters based on activity type before starting the action Fix Merge Conflict Labeler #2 2026-05-28T17:37:06Z Bond-009 bond.009@outlook.com 2026-05-28T17:37:06Z urn:sha1:34fc8c270cf849ce6dab1f425448411291e1ca2e Update CI dependencies 2026-05-28T03:41:28Z renovate[bot] 29139614+renovate[bot]@users.noreply.github.com 2026-05-28T03:41:28Z urn:sha1:fa3a33c04ead82a4eb0e1542369f1f87fa2a63da Fix Merge Conflict Labeler 2026-05-21T19:40:30Z Bond-009 bond.009@outlook.com 2026-05-21T19:40:30Z urn:sha1:17e2d3bb11b62ed22e42e4d2728b74ea29a9b193 https://github.com/eps1lon/actions-label-merge-conflict#example-usage Mitigate pull_request_target privilege escalation 2026-02-20T04:53:48Z Andrew Rabert ar@nullsum.net 2026-02-20T04:53:48Z urn:sha1:01eb56f04753381bdc8d4a9d2b16d0901bb69afc Hotfix — replaces pull_request_target with pull_request to stop granting write permissions and secrets to fork PRs. Some workflows will break; can be fixed properly later. Update pull-request-conflict.yml 2025-01-16T13:05:56Z felix920506 felix920506@gmail.com 2025-01-16T13:05:56Z urn:sha1:294190bb21350810890f9bcbd3edac78c25355be Update eps1lon/actions-label-merge-conflict action to v3.0.3 2025-01-06T14:49:15Z renovate[bot] 29139614+renovate[bot]@users.noreply.github.com 2025-01-06T14:49:15Z urn:sha1:b077d378fba8f37f128433bfddb261b43ea6a78c Update CI dependencies 2024-06-01T11:14:02Z renovate[bot] 29139614+renovate[bot]@users.noreply.github.com 2024-06-01T11:14:02Z urn:sha1:a7d28045cbe741cace50616a6e4b2d0d7b3f1635 Update CI dependencies 2024-05-13T13:21:27Z renovate[bot] 29139614+renovate[bot]@users.noreply.github.com 2024-05-13T13:21:27Z urn:sha1:92e5f946c133969416b64e7393b47e24e77855b6 chore(deps): update eps1lon/actions-label-merge-conflict action to v3 (#11200) 2024-04-14T13:57:53Z renovate[bot] 29139614+renovate[bot]@users.noreply.github.com 2024-04-14T13:57:53Z urn:sha1:453a5bdcf309a8943b510299d1a497433a8aa070 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>