Repository navigation
Slice: pull, device-B onboarding, and conflict reporting #190
Description
Parent
What to build
The pull side plus new-device onboarding: pull/fast-forward flow; onboarding a new device as a new bot with a confirmed reset to the remote branch (handles unrelated histories, seed discard is explicit); persona/pinned conflicts are reported to the Human, never silently merged. Verified with two bots sharing memory through a bare remote.
Acceptance criteria
- Two bots share memory via a bare remote with equal content plus history after pull.
- Device-B reset requires explicit Human confirmation; unrelated histories handled with guidance.
- A persona/pinned conflict surfaces a report; no silent overwrite.
- A non-fast-forward pull without resolution fails closed with guidance.
- Lint, format, typecheck, tests, and build pass.
Activity
DoodleBears commentedon Sep 28, 2026
Superseded by #398 via #187: pull and device-B onboarding already ship as create-from-Git-URL (#298); conflict handling stays ordinary agent Git reporting in the Channel, not a Sync slice. Closing as not planned.