What problem does it solve?
Working on multiple branches of the same repository forces constant stashing, switching, and rebuilding. This Skill manages a bare-repository-plus-worktree layout so each feature branch lives in its own directory with its own Maven repository, eliminating branch-switching conflicts.
Core Features & Use Cases
- Bare + Worktree Initialization: Clone a remote or local repository into a
.bare directory and create the main-branch worktree with automatic project and default-branch detection.
- Feature Worktree Lifecycle: Generate conventional branch names (feat-, fix-, refactor-, hotfix-), create worktrees with isolated Maven local repositories, and safely delete them after checking for uncommitted or unpushed work.
- Merge Orchestration: Coordinate merging a feature branch back into the main branch via soft reset, recommit, and fast-forward merge, delegating commit/sync/rebase steps to the nop-git-master skill.
- Use Case: You need to refactor job scheduling while a hotfix is in progress. Create a
nop-entropy-refactor-job-scheduling worktree alongside the hotfix worktree, develop both in parallel, then merge each back to master independently.
Quick Start
Initialize a bare-plus-worktree layout for my repository at ~/app/nop-entropy-wt and create a new feature worktree for adding user authentication.
