update-nanoclaw

Merge upstream NauggieClaw updates into customized forks with backups and conflict previews.

1|2|Updated Apr 8, 2026
One-click install
npx skills add https://github.com/jboothomas/nauggieclaw --skill update-nanoclaw-jboothomas
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: update-nanoclaw
Source: https://github.com/jboothomas/nauggieclaw/tree/main/.claude/skills/update-nanoclaw
Command: npx skills add https://github.com/jboothomas/nauggieclaw --skill update-nanoclaw-jboothomas

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Customized NauggieClaw forks drift from upstream, making merges risky, token-heavy, and prone to losing localized changes; this Skill orchestrates preflight safety checks, backups, previews, and optional migrations so you can catch up without a reinstall.

Core Features & Use Cases

  • Safety-first preflight: Enforces a clean working tree, adds or verifies the upstream remote, detects the active branch, and fetches commits before touching anything.
  • Backup + preview: Creates timestamped backup branches and tags, shows upstream vs. local diffs, buckets changed files, and previews conflicts via a dry-run merge before committing.
  • Flexible update paths: Supports merge, cherry-pick, and rebase workflows with conflict resolution best practices, followed by npm build/test validation and breaking-change detection that triggers migration skills when necessary.
  • Use Case: Run this Skill whenever you want to merge a long-running upstream spree into your customized fork so you know exactly what will change, where conflicts may arise, and how to return to the previous state if needed.

Quick Start

Run /update-nanoclaw in Auggie to preview upstream diffs, create backups, and merge or cherry-pick safely.

Frequently Asked Questions about update-nanoclaw

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

FAQPage Schema
How do I safely merge upstream updates into a customized git fork without losing local changes?

To safely merge upstream updates, this Skill enforces a clean working tree, creates timestamped backup branches and tags, and previews conflicts via a dry-run merge before committing changes to your customized fork.

What's the best way to preview git merge conflicts before applying upstream commits?

The best way to preview git merge conflicts is running a dry-run merge that buckets changed files and shows upstream versus local diffs, allowing you to see exactly where conflicts may arise before touching your working tree.

Can I cherry-pick upstream commits into my fork instead of doing a full merge?

Yes, you can cherry-pick upstream commits. This Skill supports merge, cherry-pick, and rebase workflows, applying conflict resolution best practices and running npm build and test validation after the cherry-pick completes.

Do I need a clean working tree before syncing my fork with upstream?

Yes, you need a clean working tree. The safety-first preflight enforces this requirement, adds or verifies the upstream remote, detects the active branch, and fetches commits before attempting any backup or merge operations.

How does breaking-change detection work after syncing a fork with upstream updates?

Breaking-change detection works by running npm build and test validation after the merge or cherry-pick, triggering optional migration skills when necessary to help you adapt your customized fork to upstream structural changes.