Skip to content

sync: resolve exact entity-aware conflicts - #8

Merged
callumalpass merged 1 commit into
mainfrom
agent/entity-aware-conflicts
Aug 7, 2026
Merged

sync: resolve exact entity-aware conflicts#8
callumalpass merged 1 commit into
mainfrom
agent/entity-aware-conflicts

Conversation

@callumalpass

Copy link
Copy Markdown
Collaborator

Summary

  • upgrade the plugin to the coordinated beta.41 exact sync engine
  • render record and binary-file conflicts from the unified engine-owned status
  • echo the reviewed semantic decision token when choosing local or hosted state
  • project explicit conflict cleanup actions without inventing transfers

Verification

  • npm run build
  • npm test (44 tests)
  • git diff --check

@callumalpass
callumalpass merged commit 4cdcb23 into main Aug 7, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant