Repository navigation
DEN-3945: consolidate all branches into main (2026-09-12 sweep) - #8
Draft
ORESoftware wants to merge 6 commits into
Draft
ORESoftware wants to merge 6 commits into
ORESoftware wants to merge 6 commits into
Conversation
Document the authorized worktree location and ensure repository-local temporary directories stay outside version control.
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 from a dirty checkout so the work is on GitHub rather than only on one laptop. Built through a temporary index: the working tree, HEAD and the index in zed-pkg/zed-cursor were not modified, and nothing was stashed, reset or discarded. Base: 80abae7 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LQF5QdYe9exL6HgFBSbapi
…olidate-all-branches-20260912 (DEN-3945)
…olidate-all-branches-20260912 (DEN-3945)
…en-3945-consolidate-all-branches-20260912 (DEN-3945) Semantic resolution of .gitignore (two designs for the same rule): - main carries the DEN-3956 form `tmp/` + `temp/`, landed via merged PR #3 and matching the fleet-hygiene managed block's trailing-slash convention (`tmp/temp/`, `tmp/worktrees/`). - the branch proposed bare `tmp` + `temp` + `temp/worktrees`; it never had a pull request, `temp/worktrees` is already covered by `temp/`, and the bare forms would additionally ignore *files* named tmp/temp, which neither DEN-3956 nor the branch's own AGENTS.md prose asks for. No tracked path in this repository is named tmp or temp. Kept the DEN-3956 directory form and recorded both sources in the comment. `git check-ignore --no-index` confirms tmp/, temp/, tmp/worktrees/ and temp/worktrees/ are all ignored, so the branch's stated policy holds. The managed-block markers are preserved unchanged. The branch's genuinely novel contribution -- the "Repository-local Git worktrees" policy section in AGENTS.md -- merged cleanly and is preserved in full. 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
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.
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/repository-local-worktrees-20260905— merge --no-ff. AGENTS.md auto-merged, keeping the branchs novel Repository-local Git worktrees policy section in full. .gitignore was two designs for one rule: main carries DEN-3956 tmp/ + temp/ (landed via merged PR chore(DEN-3956): ignore tmp and temp directories #3, matching the fleet-hygiene managed blocks trailing-slash convention); the branch proposed bare tmp + temp + temp/worktrees, never had a PR, and its bare forms would also ignore FILES named tmp/temp (no tracked path here is named tmp or temp). Kept the directory form, cited both sources in a comment, left the managed-block markers untouched. git check-ignore --no-index proves tmp/, temp/, tmp/worktrees/ and temp/worktrees/ are all ignored, so the branchs own stated policy holds.Not merged — already landed / superseded (evidence)
Not merged — the branch has its own open PR
macs-mbp/integrate-20260912— DEN-3945: consolidate macs-mbp local branches into main (2026-09-12 sweep) #9wip/land-uncommitted-20260906— Land uncommitted work from the local checkout (4 paths) #6Not merged — needs a human/product decision
Local verification (exact head
ce454a044c94)actionlint clean on all 4 workflows; cargo fmt --check ok; cargo clippy --locked --all-targets -D warnings ok; cargo test --locked --all-targets ok (3 passed); npm ci + npm run check (tsc --noEmit) ok; npm test ok (4/4); .ores-lint/lint.sh rc=0 warn-only (48 pre-existing implicit-return findings in analyzer/src/lib.rs, untouched by the sweep; eslint not installed locally so the js slice skipped, same as a runner without it); git diff --check origin/main HEAD clean. Build output deleted.
Contracts (TJSV)
n/a - no TypeSpec or JSON Schema peer contracts tracked in this repo
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