skills.rest
spyqs
spyqsCOMMUNITY
Explore all skills by this author →
GitHub

update-skills

Merge upstream NanoClaw Claude Code skill branches while preserving local changes.

Updated Mar 15, 2026
Search Tags:#git#conflict resolution#build validation#skill updates#upstream sync#branch merging
One-click install
npx skills add https://github.com/spyqs/nanoclaw-email-imap --skill update-skills-spyqs
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: update-skills
Source: https://github.com/spyqs/nanoclaw-email-imap/tree/main/.claude/skills/update-skills
Command: npx skills add https://github.com/spyqs/nanoclaw-email-imap --skill update-skills-spyqs

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

It solves the problem of keeping your installed NanoClaw Claude Code skills up to date with upstream changes without accidentally overwriting your local customizations or ending up with a broken working tree.

Core Features & Use Cases

  • Upstream detection for installed skills: Fetches upstream skill branches and identifies which ones you previously merged locally.
  • Selective updates with conflict handling: Lets you choose which skills to update, then merges them one-by-one and guides conflict resolution without discarding intentional local edits.
  • Guardrails and validation: Refuses to run on a dirty working tree and validates the result with build (and tests if available).

Quick Start

Run the /update-skills command inside the Claude Code prompt to check upstream for updates and select which installed skills to merge.

Frequently Asked Questions about update-skills

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

FAQPage Schema
How do I sync installed skill branches with upstream changes without losing local customizations?▼

To sync installed skill branches, you can fetch upstream commits and merge them selectively while preserving local changes. The update process detects previously merged branches and guides conflict resolution one-by-one to minimize merge risk.

What happens if I try to merge skill updates on a dirty working tree?▼

Merging skill updates on a dirty working tree is blocked by preflight git checks. The process refuses to run until your working tree is clean, ensuring that local modifications are not accidentally overwritten during the upstream synchronization.

Can I choose which specific skills to update when syncing from upstream?▼

Yes, you can choose which specific skills to update. The process fetches upstream skill branches, identifies which ones you previously merged, and lets you select individual skills to merge rather than forcing a bulk update.

Does updating skill branches validate the build after merging?▼

Yes, updating skill branches validates the build after merging. Post-merge validation runs a build check, and if tests are available, it executes optional test validation to ensure the merged code functions correctly.

How does conflict resolution work when merging upstream skill code?▼

Conflict resolution during upstream skill code merging preserves intentional local edits. The process merges skills one-by-one and guides you through resolving conflicts without discarding your local customizations.

Related Skills

Explore More Software Engineering Skills→
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate
sliamh11sliamh11
50

update-skills

Automate updating installed Claude skills by merging upstream branches with validation.

Community
Advanced
MoonLadderStudiosMoonLadderStudios
12

fix-merge-conflicts

Fetch origin/main, merge into the current branch, resolve conflicts, and push.

Official
Intermediate
Chanw-researchChanw-research
38

ppw:update

Fetch upstream SKILL.md and reference updates and apply them locally.

Official
Advanced