Syncs feature branches with origin/main using structured merge workflows and conflict resolution.
Install
mkdir -p .claude/skills/pull && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/9510" && unzip -o skill.zip -d .claude/skills/pull && rm skill.zipInstalls to .claude/skills/pull
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
Pull latest origin/main into the current local branch and resolve mergeKey capabilities
- →Pull latest changes from origin/main
- →Resolve merge conflicts
- →Sync feature branches
- →Maintain history integrity
How it works
It fetches the latest refs and performs a merge-based update from origin/main, resolving conflicts safely.
Inputs & outputs
When to use pull
- →Sync a feature branch with main
- →Resolve complex merge conflicts
- →Update local environment before pushing code
About this skill
Pull
Workflow
- Verify the git status is clean or commit/stash changes before merging.
- Ensure rerere is enabled locally:
git config rerere.enabled truegit config rerere.autoupdate true
- Confirm remotes and branches:
- Ensure the
originremote exists. - Ensure the current branch is the one to receive the merge.
- Ensure the
- Fetch latest refs:
git fetch origin
- Sync the remote feature branch first:
git pull --ff-only origin $(git branch --show-current)
- Merge
origin/main:- Prefer
git -c merge.conflictstyle=zdiff3 merge origin/main
- Prefer
- If conflicts appear, resolve them, then stage the resolved files and complete the merge.
- Verify with project checks appropriate to the scope.
- Summarize the merge, including the main conflicts and how they were resolved.
Conflict guidance
- Inspect context before editing with
git status,git diff, and file-level diffs. - Decide the final behavior before editing conflict markers.
- Prefer minimal, intention-preserving edits.
- Resolve one file at a time and rerun checks after each logical batch.
- For generated files, resolve source conflicts first and regenerate if needed.
- After resolving, ensure no conflict markers remain with
git diff --check.
Ask the user only when necessary
Ask only when the correct resolution depends on product intent that is not inferable from code, tests, or nearby documentation, or when the conflict would introduce irreversible risk without an obvious safe default.
When not to use it
- →When the user wants to rebase instead of merge
- →When the branch is not intended to be synced
Prerequisites
Limitations
- →Merge-based only
- →Requires git repository context
How it compares
It uses specific git configurations like rerere and zdiff3 to ensure safe and consistent merge conflict resolution.
Compared to similar skills
pull side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| pull (this skill) | 0 | 2mo | No flags | Intermediate |
| resolve-conflicts | 81 | 8mo | Review | Intermediate |
| openspec-onboard | 10 | 6mo | Review | Beginner |
| codex-cli-bridge | 9 | 9mo | Review | Intermediate |
Try saying
Example prompts that trigger this skill in your AI assistant.
More by sushaantu
View all by sushaantu →You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
openspec-onboard
studyzy
Guided onboarding for OpenSpec - walk through a complete workflow cycle with narration and real codebase work.
codex-cli-bridge
alirezarezvani
Bridge between Claude Code and OpenAI Codex CLI - generates AGENTS.md from CLAUDE.md, provides Codex CLI execution helpers, and enables seamless interoperability between both tools
skill-sync
KyleKing
Syncs Claude Skills with other AI coding tools like Cursor, Copilot, and Codeium by creating cross-references and shared knowledge bases. Invoke when user wants to leverage skills across multiple tools or create unified AI context.
github-workflow-automation
ruvnet
Advanced GitHub Actions workflow automation with AI swarm coordination, intelligent CI/CD pipelines, and comprehensive repository management
git-advanced-workflows
wshobson
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.