conversation forks === git branches

Resolved 💬 2 comments Opened Feb 26, 2025 by adamavenir Closed May 7, 2025

Desired future state

Claude Code should allow for rapid iteration, trying different approaches, and easily rolling back or forward across conversation forks.

Potential approach

Claude Code could:

  • create a new working branch for each conversation, ie claude/{conversation-id}
  • commit each change, with each commit starting with claude/{conversation-id}/{parent-id}/{current-action-id} summary of action
  • at the point of a conversation fork, the state should roll back
  • keep a map of the branches and commits used in the conversation by using parent-id chains

(Admittedly, the {parent-id} approach is kinda hacky but it's also very simple and enables the process to be inspectable and extendible by multiple tools.)

Trivial, I know 😂 but it's how this should work and it would make Claude Code 10x as powerful for quick iteration and experimentation without feeling like you need to be running alongside Claude making commits.

View original on GitHub ↗

This issue has 2 comments on GitHub. Read the full discussion on GitHub ↗