diff --git a/.claude/skills/git-worktree/SKILL.md b/.claude/skills/git-worktree/SKILL.md index eb26a9f..4a65fa7 100644 --- a/.claude/skills/git-worktree/SKILL.md +++ b/.claude/skills/git-worktree/SKILL.md @@ -48,13 +48,13 @@ chore/update-dependencies ```bash # 1. worktreesディレクトリの確認・作成 -ls ../worktrees 2>/dev/null || mkdir -p ../worktrees +ls worktrees 2>/dev/null || mkdir -p worktrees # 2. 新しいブランチとworktreeを同時に作成 -git worktree add ../worktrees/ -b / +git worktree add worktrees/ -b / # 例: feat/add-dark-mode ブランチとworktreeを作成 -git worktree add ../worktrees/add-dark-mode -b feat/add-dark-mode +git worktree add worktrees/add-dark-mode -b feat/add-dark-mode ``` ### Worktree一覧表示 @@ -67,7 +67,7 @@ git worktree list ```bash # worktreeを削除(ブランチは残る) -git worktree remove ../worktrees/ +git worktree remove worktrees/ # worktreeをprune(不要な参照を削除) git worktree prune @@ -76,7 +76,7 @@ git worktree prune ### 既存ブランチでworktree作成 ```bash -git worktree add ../worktrees/ +git worktree add worktrees/ ``` ## 実行手順 @@ -91,11 +91,12 @@ git worktree add ../worktrees/ ``` blog/ -├── (メインリポジトリ) +├── (メインリポジトリのファイル群) +├── .gitignore # worktrees/ を除外済み └── worktrees/ - ├── add-dark-mode/ # feat/add-dark-mode - ├── fix-like-button/ # fix/like-button-error - └── refactor-api/ # refactor/api-structure + ├── add-dark-mode/ # feat/add-dark-mode + ├── fix-like-button/ # fix/like-button-error + └── refactor-api/ # refactor/api-structure ``` ## 注意事項 diff --git a/.gitignore b/.gitignore index b197737..d6cc9f8 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,7 @@ tmp .dev.vars -.open-next \ No newline at end of file +.open-next + +# git worktrees +worktrees \ No newline at end of file