[PR #9529] [MERGED] Add merge conflict comment #11963

New issue

Closed

opened 2025-12-22 09:02:24 +01:00 by backuprepo · 0 comments

backuprepo commented

2025-12-22 09:02:24 +01:00

Owner

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/9529
Author: @thornbill
Created: 3/22/2023
Status: ✅ Merged
Merged: 3/22/2023
Merged by: @thornbill

Base: master ← Head: add-merge-conflict-comment

📝 Commits (1)

09147a4 Add merge conflict comment

📊 Changes

1 file changed (+1 additions, -0 deletions)

View changed files

📝 .github/workflows/automation.yml (+1 -0)

📄 Description

Changes
Adds a comment when a PR is labeled with a merge conflict for visibility

Issues
Related to point 2 in this meta discussion: https://github.com/jellyfin/jellyfin-meta/discussions/40

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/9529 **Author:** [@thornbill](https://github.com/thornbill) **Created:** 3/22/2023 **Status:** ✅ Merged **Merged:** 3/22/2023 **Merged by:** [@thornbill](https://github.com/thornbill) **Base:** `master` ← **Head:** `add-merge-conflict-comment` --- ### 📝 Commits (1) - [`09147a4`](https://github.com/jellyfin/jellyfin/commit/09147a47cb1821bd8615764fda67ce710e69d311) Add merge conflict comment ### 📊 Changes **1 file changed** (+1 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/automation.yml` (+1 -0) </details> ### 📄 Description **Changes** Adds a comment when a PR is labeled with a merge conflict for visibility **Issues** Related to point 2 in this meta discussion: https://github.com/jellyfin/jellyfin-meta/discussions/40 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

backuprepo

2025-12-22 09:02:24 +01:00

closed this issue
added the
pull-request
label

backuprepo referenced this issue

2025-12-22 09:32:29 +01:00

[PR #11963] [MERGED] Fix Library renaming #12868

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: starred/jellyfin#11963

No description provided.

Rows
Columns