Command Claude Code
Integrate the current state of the base branch into the feature branch. Two phases: a dry-run conflict assessment first, then the actual merge with conflict resolution. The approval between the two phases is conditional — the merge runs automatically when the dry run proves the case mechanically trivial (step 4), and…