What problem does it solve? Keeping a feature branch or worktree synchronized with its remote base branch often risks losing uncommitted work, creating unwanted merge commits, or assuming the wrong default branch name. This Skill performs base-branch synchronization safely through rebase, preserving local changes and linear history. ## Core Features & Use Cases - Safe Rebase Synchronization: Fetches the remote truth and rebases the current checkout onto the requested base branch, keeping history linear without merge commits. - Local Work Preservation: Detects dirty working trees and refuses to commit, stash, or discard uncommitted changes without explicit authority. - Default Branch Resolution: Resolves the remote's advertised default branch (e.g., origin/trunk) instead of assuming main when no base is named. - Conflict Handling: Resolves conflicts when intent is established by project evidence, and reports conflicting files with the minimal decision needed when intent is ambiguous. - Use Case: Your feature branch is three commits behind origin/main with uncommitted changes in src/cart.ts. The Skill identifies the dirty state, fetches origin/main, and either rebases safely or explains exactly what blocks the update. ## Quick Start Ask the assistant to pull the latest main and rebase your current branch onto it while keeping your uncommitted work intact.