Repository navigation
DEN-3945: consolidate macs-mbp local branches into main (2026-09-12 sweep) - #25
Closed
ORESoftware wants to merge 14 commits into
Closed
ORESoftware wants to merge 14 commits into
ORESoftware wants to merge 14 commits into
Conversation
…policy reconciliation
3 file(s) that existed only in this working tree, committed on a side branch without touching the checked-out main or the working tree. Explicit paths; env/dec, keys, build output, files >5MB and secret-bearing files are excluded. Review before merging. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KAAGBnXTSw7zE5xnY4tiBY
Captured non-destructively from a temporary git index. The working tree, the real index and the stash list were not modified: nothing was stashed, reset, cleaned or popped. This exists so the work is recoverable from GitHub, not only from one laptop. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QXZDwJtqoKithFZQiHMyg8
Uncommitted changes captured via a temporary index; the working tree, index and stash were not modified.
…tegrate 20260912) Branch a37465a is a 2026-09-05 working-tree snapshot on top of 17dba56; it adopts the ORES lint toolkit (ores-lint workflow, eslint.config.mjs, lint:ores package scripts). Its other differences vs main are older copies that main has since replaced; those are not carried (merge keeps main). .github/workflows/opto-sync-real-web.yml (conflict): kept main's pin c8e03dd + mock_api_origin. The branch's pin 0560cd1 is an ancestor of c8e03dd in opto-sync/opto-sync-e2e, so main's is strictly newer. package.json (conflict): kept main's engines, owls:materialize/check/ test:unit scripts, astro 7.3.1 and devDependencies; added the branch's lint:ores, prepublishOnly, prebuild scripts and the oresLint declaration. lint.sh is warn-only (exit 0 unless ORES_LINT_STRICT=1), so prebuild cannot break the deploy build. Dependencies are unchanged, so package-lock.json stays main's. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…te 20260912) Rescue snapshot 12d12be (2026-09-05, base 17dba56) is the wip/land- uncommitted-20260905 tree plus the vendored .ores-lint/ v1.3 toolkit that the workflow and lint:ores scripts call. Carried: .ores-lint/. package.json (conflict): kept HEAD, which is already main's manifest plus the branch's lint:ores/prepublishOnly/prebuild scripts and oresLint (resolved in the previous merge). The branch's astro ^5.0.0 and bare dev/build scripts are the pre-DEN-3970 manifest that main replaced (19966ab, f9d83d0). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…t integrate 20260912) Snapshot bde34e7 (macs-mbp, 2026-09-12, base 17dba56) has a tree identical to rescue/worktree-20260905 (12d12be), which was merged in the previous commit. Nothing unique remains; recorded for ancestry only. package.json (conflict): kept HEAD, same resolution and reasoning as the rescue/worktree-20260905 merge (main's DEN-3970 manifest + lint:ores scripts); no tree change. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Contributor
Author
|
Closing:
Nothing is lost by closing: the consolidation head Linear: DEN-3945. 🤖 Generated with Claude Code |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DEN-3945 branch consolidation — laptop
macs-mbp(2026-09-12)Linear: DEN-3945. This is one laptop's half of the fleet sweep. The other laptop's consolidation PR for this repo is #24; the two cover different local disks and should both land.
Every local branch, linked worktree and uncommitted working-tree change on this machine was first published to GitHub without force (local-only
maincommits →macs-mbp/main-unpushed-20260912, dirty trees →macs-mbp/wip-20260912/*snapshot commits built through a temporary index). This branch starts atorigin/mainandgit merge --no-ffs each branch that is not already contained in or patch-equivalent tomain, oldest first. No rebase, reset, stash or force-push.Merged cleanly
wip/land-uncommitted-20260905— resolved semantically on this branch (decision recorded in the merge commit)rescue/worktree-20260905— resolved semantically on this branch (decision recorded in the merge commit)origin/macs-mbp/wip-20260912/main— resolved semantically on this branch (decision recorded in the merge commit)Not merged yet — needs semantic resolution per
ORESoftware/my-ai/AGENTS.mdnone
Published refs from this machine
macs-mbp/detached-20260912/560755aa1c93macs-mbp/integrate-20260912macs-mbp/wip-20260912/detached-560755amacs-mbp/wip-20260912/mainStatus
Draft: not yet verified locally. Conflicted branches will be resolved on this branch conceptually (both intents carried), then the repo's own checks run locally where the org has no Actions budget. Cross-language contracts in these changes are expected to pass
ORESoftware/typespec-json-schema-validatoradmission before this leaves draft.🤖 Generated with Claude Code