Integrate Branch Histories

Objective

Create the intended integrated history at an exact local target while preserving contracts, unrelated work, and recoverability.

Use When

• Merge one branch into another, fast-forward a branch, or rebase an unpublished local branch onto a new base.
• Choose merge versus rebase based on publication, policy, topology, and review needs.
• Perform an integration dry run or explain likely commits/conflicts.
• Abort or continue an integration when the primary task is completing that integration rather than resolving individual conflicts.

Do Not Use / Route Elsewhere