pull

Rebase the current Git checkout onto the latest remote base branch while preserving local work.

Updated Sep 17, 2026
One-click install
npx skills add https://github.com/hkw2028/toy-project --skill pull-hkw2028
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: pull
Source: https://github.com/hkw2028/toy-project/tree/main/.agents/skills/pull
Command: npx skills add https://github.com/hkw2028/toy-project --skill pull-hkw2028

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about pull

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I update my feature branch with the latest main using rebase?

Fetch the remote first, then rebase your current branch onto origin/main so your commits replay on top of the latest base. This keeps history linear and avoids merge commits while preserving your local work.

What happens to uncommitted changes when pulling the latest base branch?

A dirty working tree is never silently committed, stashed, or discarded. The Skill identifies the uncommitted files, leaves them intact, and reports what prevents a safe update so you decide how to proceed.

Does git pull always use the main branch as the base?

No. When no base branch is named, the remote's advertised default branch is resolved, which may be main, master, or trunk. The resolved remote and base are always reported after the operation.

How are rebase conflicts handled during branch synchronization?

Conflicts with clear intent from project evidence, such as a generated lockfile derived from its manifest, are resolved automatically. Ambiguous conflicts keep your work recoverable and report the files plus the minimal decision needed.

Can I update a detached worktree to the latest main without losing commits?

Yes. The Skill recognizes detached checkouts, preserves a recoverable reference to local commits, and rebases onto the fetched base so no work is lost during the update.