From c96d301eae87208fcf32372d6973277d3f5c2100 Mon Sep 17 00:00:00 2001 From: dawn Date: Fri, 18 Sep 2026 16:47:37 +0300 Subject: [PATCH] web/pr: dedupe merge check list by filename Signed-off-by: dawn --- .../pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte b/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte index 31413f682..1dddbdb2b 100644 --- a/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte +++ b/web/src/routes/[handle]/[repo]/pulls/[aturi]/[version]/[[range]]/PullViewPage.svelte @@ -195,7 +195,12 @@ let allConflictsShown = $state(false); let conflictsPreviewHeight = $state(undefined); - const conflicts = $derived(check.data?.conflicts ?? []); + // gitmirror lists one entry per conflict class, so a filename can repeat + const conflicts = $derived( + (check.data?.conflicts ?? []).filter( + ({ filename }, i, all) => all.findIndex((c) => c.filename === filename) === i + ) + ); const shownConflicts = $derived( allConflictsShown ? conflicts : conflicts.slice(0, CONFLICT_PREVIEW_COUNT) ); -- 2.51.2