Merge trunk into the worktree and validate with tests before review.
npx skills add https://github.com/netguy204/vibe-engineer --skill chunk-rebase
Please help me install this Agent Skill. Skill: chunk-rebase Source: https://github.com/netguy204/vibe-engineer/tree/main/.agents/skills/chunk-rebase Command: npx skills add https://github.com/netguy204/vibe-engineer --skill chunk-rebase
Merge trunk into the worktree before review to ensure the REVIEW phase sees code that has already been synchronized with concurrent changes from other chunks.
Commit any work, run the rebase step as part of the chunk workflow, and fix conflicts as directed.
High-intent search queries and answers about installing and using this skill.
To merge trunk into a git worktree, you commit any current work and run the rebase step to integrate concurrent changes. This ensures the review phase sees synchronized code and validates compatibility by running tests.
Resolving git merge conflicts during a chunk workflow involves following guided resolution steps that preserve your specific chunk goals. The process integrates trunk changes into the worktree while maintaining the integrity of your concurrent work.
You should run tests after integrating trunk changes to validate the integrated state and confirm compatibility before progression to the review phase. This test verification ensures the rebase step produced a stable, conflict-free codebase.
Yes, git worktree rebase is designed for parallel chunk development. It performs pre-merge integration to synchronize your active worktree with concurrent changes from other chunks, ensuring the review phase evaluates fully integrated code.
Yes, you need to commit any current work before starting the rebase step. Committing ensures your changes are safely integrated with the trunk during the merge orchestration and prevents data loss during conflict resolution.
saxonthuneRebase a worktree branch onto the latest trunk with safety checks.
enkira-aiChunk an RFC into an Epic and sub-issues, then execute a branch-to-merge loop per chunk.
arpitnathOrchestrate multi-agent teams across separate git worktrees for parallel development.
MilesChouResolve Git conflicts during rebase or merge operations.
