rbrooks/TeaLeaves

v7: Conflict resolution & review queue #11

New issue

Closed

opened 2026-06-22 23:54:48 +00:00 by rbrooks · 0 comments

rbrooks commented

2026-06-22 23:54:48 +00:00

Owner

Prevent silent overwrites from concurrent cross-instance edits.

Last-write-wins for the initial implementation (low-frequency, human-paced editing)
Optimistic locking on entries.updated_at: reject a remote update if local updated_at is newer than the activity's published timestamp
Surface conflicts to the project owner in a review queue rather than dropping them
Reuse v8's moderation-queue infrastructure, or stub a minimal version if v8 ships later

Imported from ROADMAP.md.

Prevent silent overwrites from concurrent cross-instance edits. - [ ] Last-write-wins for the initial implementation (low-frequency, human-paced editing) - [ ] Optimistic locking on `entries.updated_at`: reject a remote update if local `updated_at` is newer than the activity's `published` timestamp - [ ] Surface conflicts to the project owner in a review queue rather than dropping them - [ ] Reuse v8's moderation-queue infrastructure, or stub a minimal version if v8 ships later --- _Imported from `ROADMAP.md`._

rbrooks added this to the v7.0.0 - Cross-Instance Collaborative Editing milestone

2026-06-22 23:54:48 +00:00

rbrooks added the

label

2026-06-22 23:54:48 +00:00

claude-bot referenced this issue

2026-06-29 21:28:04 +00:00

v7: Editor-side outbound — send signed writes + remote-project edit UI #62

rbrooks referenced this issue from a commit

2026-06-30 01:04:56 +00:00

feat(p12): schema for cross-instance write path (#12)

claude-bot referenced this issue

2026-06-30 01:08:09 +00:00

feat: schema for cross-instance write path (#12) #63

rbrooks referenced this issue from a commit

2026-06-30 01:35:03 +00:00

feat(p10): signed cross-instance write path (#10)

claude-bot referenced this issue

2026-06-30 01:38:22 +00:00

feat: signed cross-instance write path (#10) #65

rbrooks referenced this issue from a commit

2026-06-30 01:53:59 +00:00

feat(p11): conflict resolution + remote-contribution review queue (#11)

rbrooks referenced this issue from a commit

2026-06-30 01:53:59 +00:00

docs(p11): changelog for conflict review queue (#11)

claude-bot referenced this issue from a pull request that will close it,

2026-06-30 01:59:18 +00:00

feat: conflict resolution + remote-contribution review queue (#11) #67

claude-bot closed this issue

2026-06-30 02:04:19 +00:00

claude-bot referenced this issue from a commit

2026-06-30 02:04:19 +00:00

Merge pull request 'feat: conflict resolution + remote-contribution review queue (#11)' (#67) from feat/v7-conflict-review-queue into main

claude-bot referenced this issue

2026-06-30 14:08:29 +00:00

feat: editor remote read + compose/edit — closes #62 (part 3) #71

Sign in to join this conversation.

No labels

No milestone

No project

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.

Dependencies

No dependencies set.

Reference

rbrooks/TeaLeaves#11

No description provided.