You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
tri: add seal merge-driver to auto-resolve timestamp conflicts on rebase #14063
When two PRs seal the same spec, rebase always conflicts on the sealed_at timestamp in .trinity/seals/*.json. The resolution is always mechanical: keep the newer timestamp, all hashes stay the same.
Scope
.gitattributes or git config merge.driver for .trinity/seals/*.json
Or tri rebase wrapper that runs git rebase then auto-resolves seal timestamp conflicts
Input
.trinity/seals/*.json files with conflict markers
Rule: keep HEAD sealed_at (newer), verify spec_hash and gen_hash_* match across both sides
Output
Conflict resolved automatically, no manual edit required
git add the file and continue rebase
Constraints
Must be a .t27 spec driving the resolution logic, not a shell script
Must not resolve conflicts where spec_hash or gen_hash_* differ (those are real conflicts)
Acceptance
A tri rebase command runs git rebase and auto-resolves seal timestamp-only conflicts
Stops and reports when hashes differ (real conflict)
Tests in spec cover: same hashes + different timestamps → auto-resolve; different spec_hash → stop
Evidence
2026-11-16: rebasing fix/auto-oneoff-14059-14060 onto master after fix/prep-oneoff-files1 merged — both touched policy_PolicyOwnLanguage.json, conflict was only sealed_at, took ~5 min manual resolution
Closed by the issue-shape gate (specs/policy/issue_shape.t27, #7498): an issue must have the template's sections. Edit the body; an edit that passes reopens it.
missing: ## Boundary -- list every file this task may touch, one per line (- specs/x.t27); without it the Queen reserves nothing and no bee can take the issue
missing: ## User Scenarios -- at least one Given/When/Then scenario
missing: ## Requirements -- numbered obligations, FR-001: ... MUST ...
Activity
github-actions commentedon Nov 16, 2026
Closed by the issue-shape gate (specs/policy/issue_shape.t27, #7498): an issue must have the template's sections. Edit the body; an edit that passes reopens it.
- specs/x.t27); without it the Queen reserves nothing and no bee can take the issueFR-001: ... MUST ...tri: add rebase_seals spec -- detect timestamp-only seal conflicts (C…