update-skills

To update skills from an upstream repository without losing local changes, run an automated update process that detects new commits, merges them into your local Git repository, and resolves conflicts to preserve your customizations.

Git merge conflict resolution when updating skills involves detecting conflicting changes between your local repository and the upstream branch, then assisting in merging the updates safely to ensure local modifications are not overwritten during the process.

Yes, you can automate version control updates for Git-based skills by running a process that checks for available updates from upstream repositories and merges them into your local branches, handling preflight checks and post-merge validation.

The best way to safely merge upstream skill updates is to use an automated update process that handles preflight checks, detects conflicts, merges the changes, and runs build and test commands for post-merge validation.

You need build and test validation after merging skill updates to ensure the newly merged changes from the upstream repository do not break existing functionality and that your local customizations remain compatible with the updated version.

You should avoid using automated Git merges for skill updates if your local repository has uncommitted changes or complex conflicts that require manual review, as the update process expects a clean state for safe merging.