Skip to content

DEN-3945: consolidate all branches into main (2026-09-12 sweep) - #10

Merged
the1mills merged 2 commits into
mainfrom
sweep/den-3945-consolidate-all-branches-20260912
Sep 28, 2026
Merged

the1mills merged 2 commits into
mainfrom
sweep/den-3945-consolidate-all-branches-20260912

Conversation

@ORESoftware

Copy link
Copy Markdown
Contributor

Consolidation of all branches into main — DEN-3945 fleet sweep (2026-09-12)

Linear: DEN-3945. Every local branch, worktree and uncommitted change found under ~/codes was published without force (diverged locals → rescue/local-20260912/*, uncommitted work → rescue/wip-20260912/*, never auto-merged). This PR merges every remaining branch with merge commits only — no rebase, reset, stash or force-push.

Merged cleanly (0)

Not merged — the branch has its own open PR (that PR is canonical)

  • codex/den-3913-shared-auth-env-logo#2

Contracts

Interfaces crossing language/runtime boundaries stay under fail-closed admission by ORESoftware/typespec-json-schema-validator (TJSV): human-authored TypeSpec and JSON Schema Draft 2020-12 are peer authorities; any discrepancy stops promotion.

Merge policy

Draft until verified on the exact head. Where this org has no GitHub Actions minutes, a zero-step job is an admission refusal, not a pass — verify locally and re-run hosted CI when minutes return.

🤖 Generated with Claude Code

ORESoftware and others added 2 commits September 12, 2026 15:38
AGENTS.md requires every repository to carry the pointer block from
oresoftware/my-ai lib/agents-pointer.md, so that agents which cannot walk up
past the repository root still reach the canonical instructions via
.ores/agents/AGENTS.md. A missing pointer block is a rollout gap, not a reason
to skip those instructions.

The .ores/ symlink itself is deliberately not committed: it names an absolute
path valid only on a machine with ~/codes/oresoftware/my-ai checked out, so
committing it would break the link for everyone else and for CI. .gitignore is
updated accordingly.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VntudBLaPGetQaXDbRguZp
…-consolidate-all-branches-20260912 (DEN-3945)
@linear-code

linear-code Bot commented Sep 13, 2026

Copy link
Copy Markdown

DEN-3945

@the1mills
the1mills marked this pull request as ready for review September 28, 2026 20:02
@the1mills
the1mills merged commit 76eb528 into main Sep 28, 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.

2 participants