skills.rest
erguotou520
erguotou520COMMUNITY
Explore all skills by this author →
WebsiteGitHub

update-skills

Merge upstream skill branch updates with conflict handling and validation.

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you discover, select, and merge updates for installed skill branches without overwriting local changes or guessing which skills are already installed.

Core Features & Use Cases

  • Update Detection: Checks upstream skill branches to find which installed skills have new commits available.
  • Safe Merge Workflow: Blocks updates on dirty working trees, merges selected branches, and handles conflicts with git-native operations.
  • Post-Update Validation: Runs build and test validation after updates so you can catch merge issues quickly.
  • Use Case: Use it when your repo has several installed skills and you want to bring them up to date from upstream with minimal risk.

Quick Start

Ask the assistant to check for upstream updates to your installed skills and apply the selected skill branch merges safely.

Frequently Asked Questions about update-skills

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

FAQPage Schema
How do I update installed git branches from upstream without losing local changes?▼

To update installed git branches from upstream without losing local changes, fetch remote commits, compare merge-bases, and selectively merge branches to preserve local customizations safely.

What is the safest way to merge upstream skill branches while managing conflicts?▼

The safest way to merge upstream skill branches while managing conflicts requires a clean working tree check, followed by remote fetching, branch merging, and git-native conflict handling operations.

Can I detect which installed skill branches have new commits available in upstream?▼

Yes, you can detect which installed skill branches have new commits available in upstream by fetching remote updates and comparing the current local branch state against the upstream merge-base.

Does the upstream update process validate builds and tests after merging?▼

Yes, the upstream update process runs post-merge build and test validation immediately after merging selected skill branches, allowing you to catch integration issues and merge conflicts quickly.

Why does merging upstream updates require a clean working tree?▼

Merging upstream updates requires a clean working tree because the safe merge workflow blocks updates on dirty repositories to prevent overwriting uncommitted local changes during the branch merge operation.

What happens if there are git conflicts when syncing skills from upstream?▼

If there are git conflicts when syncing skills from upstream, the update workflow handles conflicts with git-native operations, pausing the merge to let you resolve differences before continuing validation.

Related Skills

Explore More Software Engineering Skills→
TMI-appsTMI-apps
2

push

Validate and push committed Git changes to a remote repository.

Official
Intermediate
p-o-ke-naep-o-ke-nae

github-flow

Guide GitHub Flow branching, commits, testing, pull requests, and squash merges.

Community
Intermediate
komlukkomluk
1

git-operations

Manage Git branches, merges, cherry-picks, and conflict resolution with safety protocols.

Community
Intermediate
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate