merge

Merge a branch into a reviewable integration branch off the target — merge directly when nothing diverged, and when commits landed in between, dry-run the merge, auto-resolve the riskless conflicts, decide the risky ones with the user one at a time, then build the approved merge on the branch. The target is left untouched for review.