What problem does it solve? Merging a moved-ahead base branch into a long-lived feature or epic branch produces conflicts, stale PR descriptions, and silently duplicated backlog entries. This Skill defines the exact merge order, per-file-kind conflict resolution techniques, and post-merge verification steps so the branch returns to a mergeable state without losing work or breaking bot-signed commit rules. ## Core Features & Use Cases - Ordered merge procedure: Fetch, merge with bot signature variables set inline, and enumerate conflicts with git diff --diff-filter=U before resolving anything. - Per-file-kind resolution table: Different strategies for code, generated files, specs in docs/specs/, rule companions, and the backlog work list, each paired with its check command (check:dupes, check:specs, check:board). - Post-merge verification: Grep for leftover conflict markers, re-read and patch the PR body via the REST API, verify issue state for non-default-base merges, and check branch lag with the compare endpoint. - Use Case: A PR is marked conflicting after main advanced. You merge origin/main in with the bot signature, resolve a spec conflict by keeping both sides, deduplicate the backlog entry against the issue queue, rerun the text checks, and update the PR body before calling it ready. ## Quick Start Ask the assistant to merge the base branch into the current branch and resolve the conflicts following the git-workflow-merge pattern.
