feat(workspace-jj): fan-flames dual-topology handling + DAG reshape#41
Merged
feat(workspace-jj): fan-flames dual-topology handling + DAG reshape#41
Conversation
…eference - Detect auto-chained vs independent branch topology after fan-out - Pattern A (chained): content already merged, skip squash, optionally jj parallelize - Pattern B (branched): squash each change into @ with conflict handling - Add DAG topology reference: jj parallelize, jj new multi-parent, jj absorb - Content is what matters; topology is presentation
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.
Summary
Updates fan-flames to handle both DAG topologies that emerge from concurrent jj workspaces:
jj parallelizefor clean history.@with conflict handling.Adds topology detection logic and a DAG reshape reference (
jj parallelize,jj newwith multiple parents,jj absorb).Key insight from testing + community research: content is what matters; topology is presentation. The chain-first approach is strictly more flexible.
Test plan
jj parallelizereshapes chain into siblings (optional)🤖 Generated with Claude Code