mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 14:00:37 +00:00
📚 Drop the two docket ids left in the branch comments
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 <alvorithm@teje.ro>
This commit is contained in:
parent
fe64834d1d
commit
2458bdb88b
@ -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}))
|
||||
|
||||
@ -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:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user