workflow-branch-synclisted

# Workflow: Branch Sync **Announce at start:** "I'm using the workflow-branch-sync skill to bring this branch up to date and help resolve any conflicts." ## When to Invoke - User's branch has fallen behind the default branch and they want it brought up to date. - User asks for help resolving merge/rebase conflicts, or wants guidance on "which side is correct". - Invoked by `/swe-workbench:sync`. ## What This Skill Does NOT Do - Does not open, merge, or comment on a PR — that is `workflow-commit-and-pr` / the user's action. - Does not resolve any conflict without first showing both sides and a recommendation with rationale. - Does not auto-push — ever. The push is a separate, explicitly prompted step at the end. - Does not rewrite history beyond the single merge or rebase the user asked for. ## Sync Contract ### Step 1 — Preflight Guard ```bash _RT="${CLAUDE_PLUGIN_ROOT:-$(git rev-parse --show-toplevel)}" _SCRIPTS="$_RT/skills/workflow-branch-sync/scripts" eval "$("$_SCRIPTS/preflight-guard.sh")" ``` Emits `CURRENT_BRANCH`, `DEFAULT_BRANCH` (detected — never hardcode `main`), `IS_DEFAULT`, `DETACHED`, `DIRTY`. - **`IS_DEFAULT=1`**: refuse. Report "already on `$DEFAULT_BRANCH` — nothing to sync onto itself" and stop. - **`DETACHED=1`**: refuse. Report "detached HEAD — checkout a branch first" and stop. - **`DIRTY>0`**: offer **stash-or-abort** before touching history — `git stash push -u -m "branch-sync: pre-sync stash"` if the user opts to stash, otherwise stop and l