菜单
Isolate code from parallel sprints mixed in the same working tree into clean Git branches. Backup the working tree, then cherry-pick files sprint by sprint into dedicated branches from main.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| name | sprint-isolation |
| description | Isolate code from parallel sprints mixed in the same working tree into clean Git branches. Backup the working tree, then cherry-pick files sprint by sprint into dedicated branches from main. |
| compatibility | Git, shell access, working tree with mixed code from multiple sprints or uncommitted feature branches. |
| metadata | {"author":"happytodev","version":"1.0"} |
When multiple agents work in parallel on the same repository without committing, the working tree contains code from all sprints mixed together. This skill extracts each sprint cleanly.
feat/sprint-* branches pointing at the same commitgit status shows modified + untracked files from multiple sourcesProgress:
- [ ] 1. Backup the working tree into a temporary branch
- [ ] 2. Checkout updated main
- [ ] 3. For each sprint, create a dedicated branch
- [ ] 4. Restore only the sprint's files from the backup
- [ ] 5. Commit + test in isolation
- [ ] 6. Repeat for each sprint
git checkout -b backup/all-sprints
git add -A
git commit -m "temp: full backup before separation"
git checkout main
git pull origin main
Identify the sprint's files (new + modified):
# List new sprint files
git diff main backup/all-sprints --name-only --diff-filter=A | grep -i pattern
# List modified files
git diff main backup/all-sprints --name-only --diff-filter=M | grep -i pattern
Create the branch and restore files:
git checkout -b feat/sprint-N-description main
git checkout backup/all-sprints -- path/file1 path/file2
For files modified by multiple sprints, use git diff
to extract only the current sprint's changes:
git diff main backup/all-sprints -- app/Models/MyModel.php
# Manually apply the relevant hunks
composer test
git log --oneline main..HEAD
src/Models/BlogPost.php or BlogPostTranslation.php may be touched by multiple sprints — check for conflicting scopes, accessors, or relationship changessrc/Filament/Resources/BlogPostResource/ forms use Filament\Schemas\Schema (not Filament\Forms) — ensure form schema methods are not duplicated across sprints2026_06_* pattern) must never be split across sprints without checking for timestamp collisionsblog_post_translations, cms_page_translations) share [entity_id, locale] unique keys — concurrent schema changes can break foreign keysresources/views/components/blocks/ Blade files may contain Tailwind classes — remember to rebuild dist CSS with npm run build before testingstorage/framework/testing/, storage/framework/views/, .phpunit.result.cache, or test-results.txtvendor/bin/pest --parallel after isolating a sprint — tests are in tests/Feature/ and tests/Unit/Analyzes Git changes, proposes CHANGELOG.md entries (user validation required), creates atomic Conventional Commits, places work on a type-named branch (feat, fix, docs…), and proposes a GitHub Pull Request. Use when the user asks to commit changes, update the changelog, prepare a branch/PR, or finalize work with atomic commits.
Orchestrates the full cycle from a need or bug to pull request: GitHub issue creation, code analysis, development generation, then calls the git-changelog workflow for atomic commits and PR. Use when the user reports a bug, requests a feature, or describes a need without specifying the implementation steps.
Automate Blogr package releases: version bumping, CHANGELOG updates, tagging, and publishing to GitHub.
Audits all quality axes of the Blogr package (tests, static analysis, code style, JS/CSS linting, CI, coverage, pre-commit hooks) and proposes one improvement at a time, validated by the human before execution. Use when starting a new development phase, after a sprint, or when the user asks to review or improve the project's quality infrastructure.
Apply a fix from a feature branch already merged to main when main has advanced. Use `git cherry-pick` to port a fix commit without rebasing the entire branch.
Detects and resolves Git merge conflicts typical of a Laravel package project with parallel feature branches. Covers conflicts on service providers, Filament Schema components, Translation-First models, and config files.