update-matclaw

Synchronize a customized MatClaw fork with upstream repository changes.

85|23|Updated Mar 7, 2026
One-click install
npx skills add https://github.com/DingyangLyu/MatClaw --skill update-matclaw
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: update-matclaw
Source: https://github.com/DingyangLyu/MatClaw/tree/main/.claude/skills/update-nanoclaw
Command: npx skills add https://github.com/DingyangLyu/MatClaw --skill update-matclaw

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Keeping a customized MatClaw fork up to date with the official repository is risky and time‑consuming. This Skill automates the process, ensuring upstream changes are incorporated safely without overwriting personal modifications.

Core Features & Use Cases

  • Preflight checks to ensure a clean working tree and configure the upstream remote.
  • Automatic backups creating timestamped branches and tags before any change.
  • Change preview grouping modified files by type and offering merge, cherry‑pick, or rebase options.
  • Conflict preview and guided resolution with minimal token usage.
  • Post‑update validation running build and tests, plus breaking‑change detection from the changelog.
  • Rollback instructions to revert instantly if needed.

Quick Start

Run the /update-matclaw command in Claude Code to synchronize your custom MatClaw with upstream safely.

Frequently Asked Questions about update-matclaw

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

FAQPage Schema
How do I sync a custom git fork with upstream changes safely?

Sync a custom git fork with upstream changes safely by running preflight checks, creating timestamped backup branches, previewing diffs, and choosing merge, cherry-pick, or rebase strategies. The process resolves conflicts and runs post-update validation to prevent overwriting local modifications.

What is the best way to merge upstream changes without losing local git modifications?

Merging upstream changes without losing local git modifications is best done by previewing grouped file diffs before applying changes. The Skill creates automatic backups and offers selective merging, cherry-picking, or rebasing to ensure personal customizations are preserved during synchronization.

How to resolve git conflicts when updating a modified fork from the original repository?

Resolve git conflicts when updating a modified fork by using guided conflict preview and resolution with minimal token usage. The Skill detects conflicts during the upstream sync, guides you through resolving them, and validates the outcome by running builds and tests.

Can I roll back an upstream sync if it breaks my custom build?

You can roll back an upstream sync if it breaks your custom build by using the provided rollback instructions. The Skill creates timestamped backup branches and tags before applying changes, plus performs breaking-change detection from the changelog to ensure instant reversion.

Does this upstream synchronization process require a clean working tree?

Yes, this upstream synchronization process requires a clean working tree. The Skill performs preflight validation to ensure no uncommitted changes exist and automatically configures the upstream remote before initiating any backup or synchronization actions.

When should I use cherry-pick instead of merge to update my fork?

Use cherry-pick instead of merge to update your fork when you want to selectively incorporate specific upstream commits without pulling the entire history. The Skill previews modified files by type and offers cherry-picking, merging, or rebasing options based on your sync needs.