2 hacks
Use `claude --worktree` (or git worktrees) so multiple agents edit isolated checkouts without colliding.
Keep personal shortcuts and machine-specific notes in CLAUDE.local.md (gitignored) instead of polluting the shared CLAUDE.md.