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: