Git Merge

Merge a source branch into a target branch by first building a picture of what changed on each side and why — drawing on every signal the branches carry, not just the raw file diff — then using that understanding to resolve conflicts so both sides' intent is preserved, rather than blindly picking a side.

Run from inside the repository (or a worktree). For a PR, the head branch is the source and the base branch is the target.

Workflow

1) Determine branches

Identify the source (being merged in) and target (being merged into):

• PR number/URL — gh pr view <pr>: head branch = source, base branch = target.
• Two branch names — use directly.
• Nothing given — ask the user.