docs(skill): the stash stack is shared across worktrees, and cede a locus twenty minutes old - #2976
Merged
Merged
Conversation
…ocus twenty minutes old Refs #2968 Two operational lessons that cost a pull request this pass. A separate `git worktree` does not get a separate stash stack. A blind `git stash -q -u; …; git stash pop -q` on a tree with nothing to stash popped the top of the shared stack -- another session's work in progress -- and `git add -A` committed 44 lines of their `compiler.rs` and `FROZEN_HASH` under my name. The symptom was a gate going red on a change that cannot touch it: a one-line edit to a test file turned `seal-coverage` red, and a release build of the branch read 152 drifted seals against master's 0. And two collisions with the parallel session, both avoidable by one command: an issue duplicating one whose chip was in the dashboard I had read in full that hour, and a one-line repair they landed first while mine was in CI. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Contributor
|
📓 NotebookLM Notebook linked to this PR
This notebook contains session context, decisions, and artifacts for this work. |
Contributor
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.
Refs #2968
Two operational lessons that cost a pull request this pass.
The stash stack is shared across every worktree. A blind
git stash -q -u; …; git stash pop -qon a tree with nothing to stash pushes nothing and pops the top of the shared stack — another session's work in progress.git add -Athen committed 44 lines of theircompiler.rsandFROZEN_HASHunder my name.The symptom is worth the section on its own: a gate going red on a change that cannot touch it. A one-line edit to a test file — which
cargo build --releasedoes not compile — turnedseal-coveragered, and a release build of the branch read 152 drifted seals against master's 0. The first move on that shape isgit diff --name-status <base>...HEAD, not reading the failure.Cede a locus twenty minutes old. An issue I filed duplicated one whose chip was in the dashboard I had read in full that hour, and a one-line repair I wrote was landed first by the session that owns the file. What survived that detour was not the patch but a measurement their PR did not carry.
Their swept-in work was returned verbatim to #2968 before the revert — a successful
popdrops the entry — and has since landed on its own as #2971.🤖 Generated with Claude Code