starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-16 05:43:54 +03:00
Code Issues 822 Packages Projects Releases 17 Wiki Activity

[PR #9529] Add merge conflict comment #12143

New Issue
Closed
opened 2026-02-07 06:50:47 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-07 06:50:47 +03:00
Owner
Copy Link

Original Pull Request: https://github.com/jellyfin/jellyfin/pull/9529

State: closed
Merged: Yes

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

**Original Pull Request:** https://github.com/jellyfin/jellyfin/pull/9529 **State:** closed **Merged:** Yes --- **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
OVERLORD added the pull-request label 2026-02-07 06:50:47 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
EFjellyfin.db
area:database
awaiting-feedback
backend
blocked
breaking change: web api
bug
build
ci
confirmed
discussion needed
dotnet future
downstream
duplicate
enhancement
feature
future
github-actions
good first issue
hdr
help wanted
invalid
investigation
librarydb
live-tv
lyrics
media playback
music
needs testing
nuget
performance
platform
pull-request
Mirrored from GitHub Pull Request
 question
regression
release critical
requires-web
roadmap
security
security
stale
support
syncplay
ui & ux
upstream
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/jellyfin#12143
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?