update-skills

To update installed git branches from upstream without losing local changes, the skill runs preflight checks, fetches upstream, and applies merges with automatic conflict resolution to prevent overwriting your local modifications.

Detecting newer commits on merged git skill branches involves scanning all upstream skill/* branches, comparing them against your merged state, and reporting new eligible updates for user approval before applying them.

Yes, applying upstream updates requires a clean working tree. The skill performs git preflight checks to ensure the working tree is clean and the correct remotes are configured before proceeding with any fetch or merge operations.

You can validate your project after merging upstream skill updates because the skill runs build and test validation operations automatically after applying merges, then reports the final results to the user.

Merge conflicts during upstream updates are handled through automatic conflict resolution during the merge process. The skill attempts to resolve conflicts automatically before proceeding to post-merge validation.

Installed skill branches drift from the upstream repository when new commits are pushed to the upstream source. This skill reduces drift by identifying those new commits and helping you merge them into your local state.