- #{selected.number} {selected.title} {stateLabel(selected.state)} {initials(selected.author)} {selected.author || (de ? "Unbekannt" : "Unknown")} {de ? "möchte" : "wants to merge"}
{#if selected.sourceBranch && selected.targetBranch}{selected.sourceBranch}→ {selected.targetBranch}{:else}{de ? "Branches werden geladen …" : "Loading branches …"} {/if}
+ #{selected.number}
{selected.title} {stateLabel(selected.state)} {initials(selected.author)} {selected.author || (de ? "Unbekannt" : "Unknown")} · {#if selected.sourceBranch && selected.targetBranch}{selected.sourceBranch}→ {selected.targetBranch}{:else}{de ? "Branches werden geladen …" : "Loading branches …"} {/if}
+ {#if detailLoadingId === selected.id || isWaitingForResolvedStatus(selected)}
{de ? "Der Anbieter prüft den gelösten Branch …" : "The provider is checking the resolved branch …"} {:else if hasConflicts(selected)}
{de ? "Dieser Request hat Merge-Konflikte." : "This request has merge conflicts."} {:else}
{de ? "Kann ohne erkannte Konflikte zusammengeführt werden." : "Can be merged without detected conflicts."} {/if}
+{selected.additions ?? "–"} −{selected.deletions ?? "–"} {#if selected.changedFiles !== null}{selected.changedFiles} {selected.changedFiles === 1 ? (de ? "Datei geändert" : "file changed") : (de ? "Dateien geändert" : "files changed")} {/if}
+ {#if hasConflicts(selected) || isLocalResolutionActive(selected)}
+
+
{#if localResolutionPhase === "preparing"} {:else if localResolutionPhase === "complete"} {:else} {/if}{isLocalResolutionActive(selected) && localResolutionMessage ? localResolutionMessage : (de ? "Löse den Konflikt mit dem lokalen Repository und Gittys Konflikt-Editor." : "Resolve this conflict with the local repository and Gitty's conflict editor.")}
+
+ {#if !isLocalResolutionActive(selected) || localResolutionPhase === "idle" || localResolutionPhase === "error"} void startLocalResolution(selected)} disabled={!selected.sourceBranch || !selected.targetBranch}>{de ? "Konflikt lokal lösen" : "Resolve locally"} {/if}
+ {#if isLocalResolutionActive(selected) && localResolutionPhase === "conflicts"} void onOpenLocalResolver()}>{de ? "Konflikt-Editor öffnen" : "Open conflict editor"} void onAbortLocalResolution()}>{de ? "Abbrechen" : "Abort"} {/if}
+ {#if isLocalResolutionActive(selected) && localResolutionPhase === "ready-to-continue"} void onContinueLocalResolution()}>{de ? "Merge abschließen" : "Complete merge"} void onAbortLocalResolution()}>{de ? "Abbrechen" : "Abort"} {/if}
+ {#if isLocalResolutionActive(selected) && localResolutionPhase === "ready-to-push"} void onPushLocalResolution()}>{de ? "Gelösten Branch pushen" : "Push resolved branch"} {/if}
+
+
+ {/if}
{de ? "Beschreibung" : "Description"} {selected.description || (de ? "Keine Beschreibung vorhanden." : "No description provided.")}