skills.rest
jeffreykthomas
jeffreykthomasCOMMUNITY
Explore all skills by this author →
GitHub

update-nanoclaw

Coordinate upstream updates for NanoClaw forks with merge, cherry-pick, or rebase.

Updated Mar 5, 2026
Search Tags:#automation#git#rollback#merge#update#conflicts#upstream
One-click install
npx skills add https://github.com/jeffreykthomas/nanoclaw-golf --skill update-nanoclaw
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: update-nanoclaw
Source: https://github.com/jeffreykthomas/nanoclaw-golf/tree/main/.claude/skills/update-nanoclaw
Command: npx skills add https://github.com/jeffreykthomas/nanoclaw-golf --skill update-nanoclaw

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Your NanoClaw fork drifts from upstream as you customize it. This skill provides a safe, guided workflow to pull upstream changes into your install without overwriting local modifications, including preflight checks, backups, previews, and multiple update strategies.

Core Features & Use Cases

  • Preflight checks to ensure a clean working tree and the presence of an upstream remote; detects the upstream branch and fetches upstream changes.
  • Safe backups via a timestamped backup branch and tag before touching any code.
  • Comprehensive preview that computes the common base, lists upstream and local commits, and buckets file-level changes by category; supports merge, cherry-pick, or rebase workflows.
  • Conflict preview to anticipate conflicts before applying updates, with options to proceed or abort.
  • End-to-end update options: full merge, selective cherry-pick of specific commits, or a rebase with appropriate conflict handling.
  • Validation step that runs npm run build and npm test to ensure changes are sound.
  • Breaking changes check against CHANGELOG.md to identify new breaking changes and optionally run migration skills.

Quick Start

Run /update-nanoclaw in Claude Code to start the update workflow.

Frequently Asked Questions about update-nanoclaw

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

FAQPage Schema
How do I merge upstream changes into my fork without losing local modifications?▼

Merging upstream changes without losing local modifications requires a workflow with preflight checks, timestamped backups, and conflict previews. It applies updates using merge, cherry-pick, or rebase strategies while validating the build to ensure local customizations remain intact.

What is the safest way to update a customized fork with upstream changes?▼

The safest way to update a customized fork is using an end-to-end workflow that creates a timestamped backup branch and tag before modifying code. It previews conflicts, validates builds with npm test, and provides rollback capabilities if the update fails.

Can I selectively cherry-pick specific commits from upstream into my fork?▼

Yes, you can selectively cherry-pick specific commits from upstream. The workflow supports a selective cherry-pick path alongside full merge and rebase options, allowing you to preview upstream commits and apply only the specific changes you need while preserving local modifications.

How do I preview git conflicts before applying an upstream merge?▼

To preview git conflicts before applying an upstream merge, the workflow computes the common base, buckets file-level changes by category, and runs a conflict preview step. This anticipates conflicts before applying updates, giving you the option to proceed or abort safely.

How do I check for breaking changes when pulling upstream updates?▼

Checking for breaking changes when pulling upstream updates involves analyzing CHANGELOG.md after applying changes. The workflow identifies new breaking changes and optionally runs migration skills to help you adapt your local customizations to the updated upstream codebase.

What should I do if my fork drifts from upstream and the update fails validation?▼

If your fork drifts from upstream and the update fails validation, the workflow provides rollback capabilities using the timestamped backup branch and tag created during preflight. You can revert to the backup state and abort the update process safely without losing local modifications.

Related Skills

Explore More Software Engineering Skills→
erguotou520erguotou520

update-skills

Merge upstream skill branch updates with conflict handling and validation.

Community
Advanced
DaFumDaFum
1

one-command-doctor

Run Node project healthchecks covering build, lint, and runtime issues.

Community
Intermediate
erguotou520erguotou520

update-nanoclaw

Synchronize a NanoClaw fork with upstream changes while preserving local modifications.

Community
Advanced
spyqsspyqs

update-nanoclaw

Synchronize a customized NanoClaw fork with upstream updates via merge, cherry-pick, or rebase.

Community
Advanced