AgentSkillsCN

update-stack

将Devkit Vue栈仓库的最新更改合并至下游项目。在拉取栈更新、通过`git merge devkit-vue/master`与上游同步，或解决栈更新带来的合并冲突时使用此功能。

SKILL.md
--- frontmatter
name: update-stack
description: Merge the latest changes from the Devkit Vue stack repository into a downstream project. Use when pulling stack updates, syncing with upstream via `git merge devkit-vue/master`, or resolving merge conflicts from stack updates.

Update Stack Skill

Pure git workflow for merging stack updates while preserving downstream customizations.

Steps

1. Add the stack remote (if not already added)

bash
git remote add devkit-vue https://github.com/pierreb-devkit/Vue.git

2. Fetch the latest stack changes

bash
git fetch devkit-vue

3. Merge the stack updates

bash
git merge devkit-vue/master

4. Handle conflicts

If conflicts occur:

  • •Config files (.env.*, src/config/*): Keep your downstream customizations
  • •Core stack files (modules, components, routes): Prefer stack changes unless you have specific customizations
  • •Documentation (README.md, CLAUDE.md): Merge both, but prefer upstream version
  • •Package files (package.json): Merge dependencies carefully, keep your project-specific needs and scripts

Common conflict patterns:

bash
# View conflicts
git status

# For each conflicted file, edit and resolve
# Then mark as resolved
git add <file>

# Complete the merge
git commit

5. Run verify (dedicated skill)

Key principles

  • •Preserve mergeability: Avoid renaming core stack files or moving them to custom locations
  • •Keep stable paths: Stack files should stay in their original locations
  • •Isolate customizations: Put project-specific code in separate files/folders when possible
  • •Test thoroughly: Always verify after merging

Notes

  • •Does not invent tooling or automation
  • •Focuses on standard git merge workflow