skills.rest
hellosimplerick
hellosimplerickCOMMUNITY
Explore all skills by this author →
GitHub

update-nanoclaw

Merge upstream NanoClaw changes into a customized fork with conflict previews.

Updated Aug 23, 2026
Search Tags:#git#backup#merge#rebase#cherry-pick#conflict-resolution#nanoclaw
One-click install
npx skills add https://github.com/hellosimplerick/nanoclaw-smoke --skill update-nanoclaw-hellosimplerick
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: update-nanoclaw
Source: https://github.com/hellosimplerick/nanoclaw-smoke/tree/main/.claude/skills/update-nanoclaw
Command: npx skills add https://github.com/hellosimplerick/nanoclaw-smoke --skill update-nanoclaw-hellosimplerick

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps developers keep a customized NanoClaw fork in sync with upstream changes without overwriting local modifications or requiring a fresh reinstall.

Core Features & Use Cases

  • Preview upstream changes by computing the merge base and showing upstream commits and file-level diffs so users can assess impact before touching their tree.
  • Safe update workflows including merge (default), selective cherry-pick, or rebase, with a dry-run conflict preview and guidance for resolving only conflict markers.
  • Robust safety net and validation through automated creation of a timestamped backup branch and tag, plus build and test validation after updates. Use case: incorporate a security patch from upstream while preserving custom skill edits and recovering quickly if something breaks.

Quick Start

Run /update-nanoclaw inside the Claude Code CLI and follow the interactive prompts to preview changes and apply a safe merge or selective cherry-pick.

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 NanoClaw updates without losing local modifications?▼

You can preview upstream commits before merging by computing the merge base and showing file-level diffs against your customized NanoClaw fork. This allows you to assess impact and review changes before touching your local tree.

Can I selectively cherry-pick upstream commits instead of a full merge?▼

Before applying updates, this Skill creates a timestamped backup branch and tag automatically. If a merge or cherry-pick breaks your build, you can quickly reset to the backup point and recover your previous working state.

What's the best way to resolve conflict markers during a NanoClaw rebase?▼

The best way to resolve conflict markers is using the dry-run conflict preview to identify issues beforehand. The Skill guides you through resolving only the conflict markers left by git, then validates the final changes with build and test checks.

Do I need a fresh reinstall to apply a security patch to a customized NanoClaw install?▼

No, a fresh reinstall is not needed. You can apply a security patch directly to your customized NanoClaw install using selective cherry-pick or merge, keeping your local modifications intact and validating the result with automated tests.

Related Skills

Explore More Software Engineering Skills→
BartunekBartunek

update-nanoclaw

Integrate upstream NanoClaw updates into customized git forks with rollback-ready changes.

Community
Advanced
travelinman1013travelinman1013

release-changelog

Generate a publish-ready changelog at releases/vYYYY.MDD.P.md from commits, changesets, and merged PRs.

Community
Advanced
erguotou520erguotou520

update-nanoclaw

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

Community
Advanced
OfirGavishOfirGavish
3

update-NinjaClaw

Merge or cherry-pick upstream NinjaClaw updates with preflight checks and backups.

Community
Advanced