Skip to content

chore: sync main to dev (specgit local-asset conflicts) - #467

Merged
LeXwDeX merged 14 commits into
devfrom
chore/sync-main-to-dev
Aug 29, 2026
Merged

chore: sync main to dev (specgit local-asset conflicts)#467
LeXwDeX merged 14 commits into
devfrom
chore/sync-main-to-dev

Conversation

@LeXwDeX

@LeXwDeX LeXwDeX commented Aug 29, 2026

Copy link
Copy Markdown
Owner

Why

PR #463 (dev→main promotion) is not mergeable: dev and main both carry specgit local-asset history that diverged. Standard sync-main-to-dev promotion path (precedent: #456).

What changed

  • Merge origin/main into dev
  • .gitignore: adopt main's specgit managed block (/.specgit.yaml, /spec_git/ local-only) — supersedes dev's single-line equivalent
  • .specgit.yaml: keep dev side (delivery binding state)

Evidence

  • git merge-tree listed exactly these two files as conflicting; both are specgit harness mechanics, no source code touched.
  • No functional change; gates re-run via CI.

@LeXwDeX
LeXwDeX merged commit e533acf into dev Aug 29, 2026
10 of 11 checks passed
@LeXwDeX
LeXwDeX deleted the chore/sync-main-to-dev branch August 29, 2026 08:10
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