skills.rest
jboothomas
jboothomasCOMMUNITY
Explore all skills by this author →
GitHub

update-skills

Fetch upstream skill branches, merge updates, and resolve conflicts.

1|2|Updated Apr 8, 2026
Search Tags:#automation#git#npm#validation#updates#conflict-resolution#skill-branches
One-click install
npx skills add https://github.com/jboothomas/nauggieclaw --skill update-skills-jboothomas
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: update-skills
Source: https://github.com/jboothomas/nauggieclaw/tree/main/.claude/skills/update-skills
Command: npx skills add https://github.com/jboothomas/nauggieclaw --skill update-skills-jboothomas

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Prevents NauggieClaw skill branches from drifting away from upstream while preserving local customizations so you do not miss critical fixes or features.

Core Features & Use Cases

  • Upstream awareness: fetches upstream skill/* branches, determines which ones you have merged, and counts new commits awaiting integration.
  • Selective updates: prompts for which outdated skills to merge, performs git-native merges, resolves conflicts by preserving custom work, and skips dirty worktrees.
  • Validation guardrails: runs npm build and tests after merging, summarizes updated skills, conflicts resolved, and the new HEAD to keep deployment confidence high.

Quick Start

Use update-skills to refresh your installed skill branches from upstream.

Frequently Asked Questions about update-skills

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

FAQPage Schema
How do I update local git branches with upstream changes without losing customizations?▼

To update local git branches without losing customizations, fetch upstream skill branches and merge them while resolving conflicts by preserving your local work. This prevents branch drift while keeping your local modifications intact.

What is the best way to automate syncing forked skill branches from upstream?▼

Automating upstream sync for skill branches involves fetching upstream commits, detecting which local branches have new commits awaiting integration, and selectively merging outdated skills to prevent drift from upstream repositories.

Does merging upstream git branches run npm build and test validation automatically?▼

Yes, after merging upstream git branches, npm build and test validation runs automatically. This validates that updated skill branches integrate cleanly, summarizing resolved conflicts and the new HEAD to maintain high deployment confidence.

How do I resolve git merge conflicts when pulling upstream changes to local branches?▼

To resolve git merge conflicts when pulling upstream changes, the process performs git-native merges and resolves conflicts by preserving custom local work. It skips dirty worktrees to ensure a clean merge environment.

Why are my installed skill branches drifting away from the upstream repository?▼

Installed skill branches drift away from upstream when local customizations are not regularly reconciled with new upstream commits. Fetching and merging upstream skill branches prevents this drift so you do not miss critical fixes or features.

Related Skills

Explore More Software Engineering Skills→
wrightchinwrightchin

update-skills

Fetch upstream skill branches, merge selected updates, and validate with build/test.

Community
Advanced
OfirGavishOfirGavish
3

update-skills

Detect and update installed skill branches from upstream Git.

Community
Intermediate
wientjeswientjes

update

Fetch upstream NanoClaw changes, merge local customizations, and run migrations.

Community
Advanced
VincentChong123VincentChong123

update-nanoclaw

Synchronize customized NanoClaw installations with upstream changes using git-native operations.

Community
Advanced