sync

<!-- Customize this skill and select save to override its behavior. Delete that copy to restore the built-in behavior. --> # Sync Changes Sync the current session branch with its upstream branch, or publish the current session branch to a remote. Use when the user asks to sync a branch, pull latest changes, rebase onto upstream, push current branch, publish branch, or set upstream. ## Guidelines - **Never force-push** (`--force`, `--force-with-lease`) without explicit user approval. - **Never skip pre-push hooks** (do not use `--no-verify`). - **Never rewrite or drop commits** during rebase without asking the user. - When in doubt about conflict resolution — ask the user. ## Workflow 1. Check for uncommitted changes first. If there are uncommitted changes, use the `/commit` skill to commit them before continuing. 2. Check whether the current session branch has an upstream branch. 3. If the current session branch has an upstream branch: 3.1. Fetch the upstream remote first so tracking refs are up to date. ``` git fetch <upstream-remote> ``` 3.2. Check ahead/behind counts. If the branch is already in sync (0 ahead, 0 behind), stop and report that no sync is needed. ``` git rev-list --left-right --count HEAD...@{u} ``` 3.3. If behind, rebase onto the upstream tracking branch. ``` git rebase @{u} ``` 3.4. If there are merge conflicts, resolve them by preserving the intent of both sides. Stage the resolved fil...