Merge-first workflow that previews upstream changes, lets user choose full merge / cherry-pick / rebase / abort, resolves only conflicted files, and validates with build + test.
