Skip to content

tri: add seal merge-driver to auto-resolve timestamp conflicts on rebase #14063

Closed as not planned

Description

@gHashTag

Goal

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

Refs #14059

Activity

  1. added
    shape-refusedClosed by the issue-shape gate (specs/policy/issue_shape.t27); a passing edit reopens it
    on Nov 16, 2026
  2. github-actions commented on Nov 16, 2026

    @github-actions
    Contributor

    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 ...
  3. added a commit that references this issue on Nov 16, 2026
    f211591
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    shape-refusedClosed by the issue-shape gate (specs/policy/issue_shape.t27); a passing edit reopens it

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions