claude-code - 💡(How to fix) Fix Seamless local multi-branching: parallel sessions currently conflict on the working tree [1 participants]

TL;DR

To avoid conflicts between parallel Claude Code sessions, consider utilizing the existing EnterWorktree primitive to create isolated worktrees for each session.

Guidance

• Investigate the EnterWorktree primitive to understand its capabilities and limitations in creating isolated worktrees.
• Explore the possibility of automating the creation of a new worktree and branch for each new session, using a predictable path like .claude/worktrees/<session-id>/.
• Consider adding a UI indicator to display the current worktree and branch for each session, to prevent mix-ups.
• Develop a one-command operation for merging or discarding a session's worktree changes into the main checkout.

Example

No code snippet is provided as the issue does not contain specific implementation details.

Notes

The proposed solution relies on the existing EnterWorktree primitive, which may have limitations or requirements that need to be understood before implementing the suggested changes.

Recommendation

Apply workaround: Utilize the EnterWorktree primitive to create isolated worktrees for each session, as this seems to be the most straightforward way to address the issue without waiting for a potential built-in multi-session support.