Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .claude/skills/git-worktree/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<branch-name> -b <type>/<short-description>
git worktree add worktrees/<branch-name> -b <type>/<short-description>

# 例: 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一覧表示
Expand All @@ -67,7 +67,7 @@ git worktree list

```bash
# worktreeを削除(ブランチは残る)
git worktree remove ../worktrees/<worktree-name>
git worktree remove worktrees/<worktree-name>

# worktreeをprune(不要な参照を削除)
git worktree prune
Expand All @@ -76,7 +76,7 @@ git worktree prune
### 既存ブランチでworktree作成

```bash
git worktree add ../worktrees/<worktree-name> <existing-branch>
git worktree add worktrees/<worktree-name> <existing-branch>
```

## 実行手順
Expand All @@ -91,11 +91,12 @@ git worktree add ../worktrees/<worktree-name> <existing-branch>

```
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
```

## 注意事項
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ tmp

.dev.vars

.open-next
.open-next

# git worktrees
worktrees