utilities/Logbook
Watch
1
0
Fork
You've already forked Logbook
 0
Code Issues 18 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Stream: inline conflict resolution UI #41

New issue
Open
opened 2026-07-23 14:46:37 +02:00 by cloudbot · 0 comments
cloudbot commented 2026-07-23 14:46:37 +02:00
Collaborator
Copy link

Inline conflict banner on a conflicted entry with Keep mine / Keep theirs / Merge in Outline, wired to the sync engine's conflict state (OQ3/S5).

See skills/design-system/SKILL.md and the prototype design/Family App.dc.html.

Inline conflict banner on a conflicted entry with **Keep mine / Keep theirs / Merge in Outline**, wired to the sync engine's conflict state (OQ3/S5). See `skills/design-system/SKILL.md` and the prototype `design/Family App.dc.html`.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
v1.1.0
v1.0.0
Labels
Clear labels   
bug
Something isn't working

  
chore
Tooling, scaffolding, maintenance

  
feature
New feature or capability

  
spike
Open question / research / decision to resolve

  
Compat/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

No labels
bug
chore
feature
spike
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
M6 · Stream Tab
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Depends on
#3 Decision: conflict UX on revision mismatch
utilities/Logbook
#26 Create-once-then-replace sync engine + conflict detection
utilities/Logbook
#39 Stream: day groups + entry cards
utilities/Logbook
Reference
utilities/Logbook#41
No description provided.