Repository navigation
DEN-3945: consolidate all branches into main (2026-09-12 sweep) - #73
Draft
ORESoftware wants to merge 7 commits into
Draft
ORESoftware wants to merge 7 commits into
ORESoftware wants to merge 7 commits into
Conversation
Commits work that was left uncommitted in this repository's working tree, so it is preserved in history rather than being lost or swept into an unrelated change later. Files were content-scanned for credentials before staging; build output was excluded. This is a checkpoint of pre-existing local work, not a reviewed change - the diff is worth reading before it is built on. Files (8): clients/java/.gradle/
AGENTS.md requires every repository's .gitignore to ignore both tmp/ and temp/ in trailing-slash form. tmp/ is the one sanctioned scratch location, and this ignore rule is what makes committing with explicit paths safe in a checkout that also holds scratch work. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VntudBLaPGetQaXDbRguZp
Uncommitted changes captured via a temporary index; the working tree, index and stash were not modified.
…nsolidate-all-branches-20260912 (DEN-3945)
…consolidate-all-branches-20260912 (DEN-3945)
…nsolidate-all-branches-20260912 (DEN-3945) Semantic union of .gitignore. The branch reordered the file (moving .gradle/ and .zig-cache/ up and dropping clients/java/.gradle/) while main kept the original order and added clients/java/.gradle/. Resolution keeps main's full entry set and appends the branch's unique contribution: the AGENTS.md-required trailing-slash scratch block (tmp/, temp/). No entry from either side was lost. Verified with git check-ignore --no-index probes: tmp/, temp/, tmp/worktrees/, clients/java/.gradle/, .gradle/, .zig-cache/, build/, node_modules/ and clients/wasm/pkg/ all still ignored; tracked sources are not. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
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
2 participants
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.
Consolidation of all branches into
main— DEN-3945 fleet sweep (2026-09-12)Linear: DEN-3945. Every local branch, worktree and uncommitted change under
~/codeswas published without force; this PR merges every branch not already inmainwith merge commits only, conflicts resolved semantically perORESoftware/my-ai/AGENTS.md. Durable sweep record:ORESoftware/den-3945-fleet-sweep.Semantically resolved and merged
chore/DEN-3956-tmp-temp-ignores— content conflict: branch reordered .gitignore (moved .gradle//.zig-cache/ up, dropped clients/java/.gradle/) while main added clients/java/.gradle/ and kept order. Union: kept main full entry set + appended branch unique AGENTS.md trailing-slash scratch block (tmp/, temp/). Proven with git check-ignore --no-index probes on tmp/, temp/, tmp/worktrees/, clients/java/.gradle/, .gradle/, .zig-cache/, build/, node_modules/, clients/wasm/pkg/ plus negative controls (clients/java/src/Main.java, README.md not ignored). Also merged current origin/main (3 commits, zed-latest-deps pre-push gate) into the sweep first; that merge was clean.Not merged — already landed / superseded (evidence)
Not merged — the branch has its own open PR
Not merged — needs a human/product decision
Local verification (exact head
2ae599d15462)ci.yml contract job on merged head: python3 -m unittest tests.test_validate_client_matrix OK (4 tests); scripts/check-client-capability-drift.py OK; scripts/validate-client-matrix.py FAILS (.zpkg.lock missing canonical zed-pkg/zed-interfaces) but fails identically on origin/main in a detached worktree => pre-existing, not sweep-caused. git diff --check origin/main HEAD clean. Heavy polyglot builds (rust/java/swift/dart/wasm) not run: change is .gitignore-only and disproportionate; disk was 69GB free so not a disk skip.
Contracts (TJSV)
n/a to changed paths: only TypeSpec/JSON-Schema peer pair in repo is the fixture pair contract-admission/fixtures/package-ref/{main.tsp,authored.schema.json}; clients/client-api.schema.json and schemas/client-api.schema.json have no .tsp peer. Merge touched no contract file.
Merge policy
Draft until verified on the exact head. Where this org has no GitHub Actions minutes, zero-step jobs are admission refusals, not passes.
🤖 Generated with Claude Code