chore(claude.md): warn against parallel-Claude-hostile git operations#1243
Open
John-David Dalton (jdalton) wants to merge 1 commit intomainfrom
Open
chore(claude.md): warn against parallel-Claude-hostile git operations#1243John-David Dalton (jdalton) wants to merge 1 commit intomainfrom
John-David Dalton (jdalton) wants to merge 1 commit intomainfrom
Conversation
Multiple Claude sessions can run concurrently against the same checkout, parallel worktrees, or sibling clones. Document which git ops break that contract (stash, add -A, branch switching, reset --hard non-HEAD) and the safe alternatives (worktrees, surgical add).
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.
Multiple Claude sessions can run concurrently against the same checkout, parallel worktrees, or sibling clones. Document which git ops break that contract (
stash,add -A, branch switching,reset --hardnon-HEAD) and the safe alternatives (worktrees, surgical add).Same change applied across the fleet to ensure consistent behavior.
Note
Low Risk
Documentation-only change with no runtime impact; risk is limited to teams misapplying the git guidance if it doesn’t match their workflow.
Overview
Adds a new "PARALLEL CLAUDE SESSIONS - WORKTREE REQUIRED" section to
CLAUDE.mdwarning that certain git operations (e.g.,git stash,git add -A/., branch switching, andgit reset --hardoff-HEAD) can corrupt concurrent Claude sessions.Documents the required safe alternatives: use
git worktreefor branch work, stage via explicit file paths, and prefer WIP commits in a worktree over stashing.Reviewed by Cursor Bugbot for commit dad6795. Configure here.