From 2458bdb88b9dbb07ef5d616770a947e28203536a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Tejero=20Cantero?= Date: Sat, 3 Oct 2026 23:50:25 +0200 Subject: [PATCH] :books: Drop the two docket ids left in the branch comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two frontend comments still cited a docket entry id that resolves only on the machine the set lives on, which the reviewer this branch is written for cannot follow. Each citation stood beside the behaviour it records, so both sentences stand without it, as in the earlier commit that dropped four such ids. The change in data/workspace/branches.cljs was staged by hunk: the working tree holds another session's uncommitted edits to that file. AI-assisted-by: mixed models Signed-off-by: Álvaro Tejero Cantero --- frontend/src/app/main/data/workspace/branches.cljs | 2 +- frontend/src/app/main/ui/workspace/sidebar/branches.cljs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/main/data/workspace/branches.cljs b/frontend/src/app/main/data/workspace/branches.cljs index 66488d0f46..ff3dcd1d1a 100644 --- a/frontend/src/app/main/data/workspace/branches.cljs +++ b/frontend/src/app/main/data/workspace/branches.cljs @@ -491,7 +491,7 @@ ;; the returned conflicts are authoritative: they are the very ;; ones the command computes `resolved?` against, and the diff ;; the modal could fetch on its own is computed in another id - ;; space, which can disagree with them (vcs:tp-update-conflict-frame) + ;; space, which can disagree with them :conflicts (rx/of (open-conflict-resolutions {:branch branch :mode :update :conflicts conflicts})) diff --git a/frontend/src/app/main/ui/workspace/sidebar/branches.cljs b/frontend/src/app/main/ui/workspace/sidebar/branches.cljs index 7bc7c5e76e..7105248975 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/branches.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/branches.cljs @@ -1603,7 +1603,7 @@ ;; computed in the id space it resolves against; the diff this dialog ;; can fetch may have been computed in another id space and disagree, ;; which left the dialog showing 0 of 0 with an Apply that could never - ;; enable (vcs:tp-update-conflict-frame). Prefer what the command said. + ;; enable. Prefer what the command said. conflicts (if (seq conflicts) conflicts (:conflicts diff)) ;; the payload's two sides are document-keyed in both directions: