What problem does it solve? Keeping a long-lived feature branch up to date with the repository's default branch is error-prone: developers often assume the branch is named main or master, merge from the wrong remote, or accidentally rebase, push, or leave conflict markers behind. This Skill performs a controlled, validated merge of the actual default branch into the current branch with strict safety boundaries. ## Core Features & Use Cases - Default branch resolution: Detects the remote's real default branch via symbolic HEAD or GitHub metadata instead of assuming main or master, and selects the correct remote (PR head remote or configured upstream). - Two merge modes: A complete mode that finishes the merge commit with a clean validated tree, and a prepare-only mode that leaves a staged, uncommitted merge for explicit handoff workflows. - Conflict handling and validation: Resolves conflicts by inspecting surrounding code and tests, removes all conflict markers, stages only resolved files, and runs the smallest relevant validation. - Use Case: While working on a feature branch in a pull request, ask the agent to sync from the default branch; it fetches only the relevant remote, merges, resolves conflicts, validates, and reports the result without ever pushing. ## Quick Start Use the sync-main skill to merge the repository's default branch into my current feature branch and resolve any conflicts.
