sync-target

name	sync-target
description	Merge this branch's target (open PR's base or repo default) into HEAD, resolve conflicts in branch context, push unless held. Use when the user asks to sync, merge main/dev/target into HEAD, or resolve merge conflicts.

Load skills: pr-context, quality-ship, git-advanced. (worktree-setup is lazy — see §5.)

1. Resolve target

Target = where this branch lands. Precedence: explicit arg → open PR's baseRefName → repo default (origin/HEAD). Never hardcode dev/main.

CURRENT=$(git rev-parse --abbrev-ref HEAD)
REMOTE=$(git remote | head -1)
git fetch "$REMOTE" --prune

TARGET=$(printf '%s\n' $ARGUMENTS | grep -v '^--' | head -1)
[ -z "$TARGET" ] && TARGET=$(gh pr view --json baseRefName --jq .baseRefName 2>/dev/null)
[ -z "$TARGET" ] && TARGET=$(git symbolic-ref refs/remotes/"$REMOTE"/HEAD 2>/dev/null | sed "s|refs/remotes/$REMOTE/||")

If $TARGET is empty or equals $CURRENT, ask. Surface "$REMOTE/$TARGET" → "$CURRENT" and confirm — stacked PRs miscall easily.

2. Branch context

gh pr view --json title,body,headRefName,baseRefName 2>/dev/null
git log --oneline "$REMOTE/$TARGET".."$CURRENT"
git diff --stat "$REMOTE/$TARGET".."$CURRENT"

Note: files this branch owns, what it changes, what to preserve from upstream.

3. Merge

git merge "$REMOTE/$TARGET" --no-edit

Clean? Skip to §5. Else capture the targeted scope for §4–§5:

CONFLICTS=$(git diff --name-only --diff-filter=U)

Hold in memory — the U filter empties after staging.

4. Resolve conflicts

For each file in $CONFLICTS, read both sides and classify. Tag each resolution High (mechanical, clear intent) or Low (judgment call on business logic) — §6 gates on these tags.

Type	Action
Non-overlapping	Integrate both
Superseding	Keep ours; adopt new deps/imports/types from theirs
Upstream improvement	Take theirs
Genuine collision	Judge from branch context

Stage resolutions, then git commit --no-edit.

5. Quality checks (scoped)

Targeted scope = $CONFLICTS — not the full merge diff. Upstream lines came in pre-validated; widening scope rebuilds packages this branch never touched.

Run quality-ship with that scope:

• Per-file validators (format, lint, slop-scan, vulture, …): pass $CONFLICTS paths.
• Package-scoped validators (typecheck, tests, knip, …): scope to the packages owning $CONFLICTS (e.g. turbo run … --filter={<pkg>…}).

Worktree repair is lazy — load worktree-setup only on Cannot find module / empty-dist/ errors for an in-scope package. Don't run verify.py proactively; its full-workspace manifest will demand artifacts (electron-forge bundles, …) outside your scope.

$ARGUMENTS may include --full-scope to opt back into whole-diff validation.

Separate commits for fixes.

6. Push gate

Hold if any:

• $ARGUMENTS contains --no-push
• User said hold off this session
• Any Low-confidence resolution

When holding: summarize each resolution + confidence; for Low ones, name the ambiguity and the choice; ask before pushing.

Otherwise:

git push -u origin HEAD