Pull

This automates the full merge-based workflow for syncing a feature branch with origin/main, including conflict resolution strategy. It fetches, pulls your current branch first to catch remote updates, then merges origin/main with zdiff3 conflict style for better context. The conflict resolution guidance is the real meat here: it walks through understanding intent on both sides, using git diff incantations to compare base/ours/theirs, and making semantic decisions before touching code. It's opinionated about when to ask users (almost never) and includes practical rules like resolving source files before regenerating artifacts. If you're tired of Claude stopping mid-merge to ask permission for every conflict, this gives it a clear decision framework and keeps things moving.

skills.sh installs: 542
GitHub stars: 82
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add odysseus0/symphony --skill pull --agent claude-code

Installs into .claude/skills of the current project.

Files

Pull

Workflow

Verify git status is clean or commit/stash changes before merging.
Ensure rerere is enabled locally:
- git config rerere.enabled true
- git config rerere.autoupdate true
Confirm remotes and branches:
- Ensure the origin remote exists.
- Ensure the current branch is the one to receive the merge.
Fetch latest refs:
- git fetch origin
Sync the remote feature branch first:
- git pull --ff-only origin $(git branch --show-current)
- This pulls branch updates made remotely (for example, a GitHub auto-commit) before merging origin/main.
Merge in order:
- Prefer git -c merge.conflictstyle=zdiff3 merge origin/main for clearer conflict context.
If conflicts appear, resolve them (see conflict guidance below), then:
- git add <files>
- git commit (or git merge --continue if the merge is paused)
Verify with project checks (follow repo policy in AGENTS.md).
Summarize the merge:
- Call out the most challenging conflicts/files and how they were resolved.
- Note any assumptions or follow-ups.