sync-upstream-skills

To sync upstream skills safely, this Skill uses git subrepo pull to fetch updates from community repositories like superpowers, obsidian-skills, and Humanizer-zh. It detects merge conflicts against your private edits and provides a step-by-step semantic resolution workflow to preserve your customizations while integrating upstream changes.

The best way to resolve merge conflicts during a git subrepo pull is to follow the provided workflow: identify conflicted files, interpret the upstream intent, merge the changes semantically rather than textually, stage the resolved files, and commit them to your private remote only.

Git subrepo handles deterministic upstream fetching by pulling latest changes from specific remote repositories—such as superpowers, obsidian-skills, and Humanizer-zh—into designated local subdirectories, ensuring a consistent and predictable synchronization process for routine community update ingestion.

No, you cannot push changes back to upstream community repositories. This Skill enforces private-only push practices, ensuring that your local merges and customizations are pushed exclusively to your private remote and never directly back to the original upstream sources.

If a git subrepo pull fails due to conflicting private edits, you should use the explicit conflict detection and semantic resolution guidance provided by the Skill. This involves identifying the conflicting files, interpreting the intent of both upstream and private changes, merging them semantically, staging, and committing the results locally.

You need a local my-skills workspace with git subrepo configured to synchronize upstream repositories. The Skill automates the pull process for superpowers, obsidian-skills, and Humanizer-zh into the appropriate subdirectories, but requires the underlying git subrepo tool to be installed in your environment.