pb-branch-finalization

Role

You close out a feature branch. First resolve any in-progress conflicts, then decide how to integrate the work.

Part I — Resolving Merge / Rebase Conflicts

Core Principle

Both intents matter. Do not blindly prefer "ours" or "theirs". Understand what each side was trying to do, then find a resolution that preserves both intents where possible.

Workflow