$ loading_

using-git-worktrees — askskill

$ ~/registry/skill/microsoft-agency-plugins-nori-skills-using-git-worktrees

SKILL

using-git-worktrees

帮助你使用 Git worktree 创建相互隔离的并行工作区。

来源

GitHub

更新于

2026-06-07

// 安全评估低风险

仅提示词，不执行代码
开源可审计

正在进行安全审计…

凭证密钥
网络外发
代码执行
数据访问
来源供应链

// 安装

复制安装指令，让 AI 自动完成配置 · 推荐新手

请帮我安装 askskill 上的 "using-git-worktrees" 技能：
1. 下载 https://raw.githubusercontent.com/microsoft/FluidFramework/main/.agency/plugins/nori/skills/using-git-worktrees/SKILL.md
2. 保存为 ~/.claude/skills/using-git-worktrees/SKILL.md
3. 装好后重载技能，告诉我可以用了

// 下载

下载 SKILL.md机读安装清单 ↗

// 用法示例

并行开发新功能

输入

我需要在不影响当前分支工作的情况下开发一个新功能，请指导我使用 git worktree 创建独立工作区，并给出完整命令。

预期产出

提供创建新 worktree、切换分支和开始开发的步骤与命令。

隔离修复紧急 Bug

输入

当前我在做大改动，但现在要紧急修复线上 Bug。请用 git worktree 方案帮我快速开一个独立目录处理 hotfix，并说明完成后如何清理。

预期产出

给出 hotfix worktree 的创建、提交、合并及移除目录的操作说明。

同时审查多个分支

输入

我想同时打开主分支和一个评审分支进行对比，请说明如何用 git worktree 管理两个独立工作目录，并避免分支冲突。

预期产出

说明如何为多个分支建立独立目录，并提供安全使用建议。

// 文档

<required> *CRITICAL* Add the following steps to your Todo list using TodoWrite:

Find the worktrees directory.

Check existing directories using the Bash tool: ls -d .worktrees 2>/dev/null
If not found, ask me for permission to create a .worktrees directory
If given permission, create .worktrees.

Verify .gitignore before creating a worktree using the Bash tool:

# Check if directory pattern in .gitignore
grep -q "^\.worktrees/$" .gitignore || grep -q "^worktrees/$" .gitignore

If not found, add the appropriate line to the .gitignore immediately.

Create the worktree

Come up with a good branch name based on the request.
Create the worktree with the Bash tool: `git worktree add ".worktrees/$BRANCH_NAME" -b "$BRANCH_NAME"
cd into the newly created path with the Bash tool: cd $path

Auto-detect and run project setup.

# Node.js
if [ -f package.json ]; then npm install; fi

# Rust
if [ -f Cargo.toml ]; then cargo build; fi

# Python
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f pyproject.toml ]; then poetry install; fi

# Go
if [ -f go.mod ]; then go mod download; fi

</required> <good-example> cd /home/$USER/code/project/.worktrees/branch-name && npm run lint </good-example>

// 同源资产

技能

handle-large-tasks

将长期复杂任务拆分为可执行小步骤，减少上下文超限与遗漏

microsoft装→

技能

brainstorming

通过结构化追问与方案比较，把模糊想法梳理成可执行设计。

microsoft装→

// 功能相似

技能

git-branch

帮助你创建、切换并检查代码分支，确保实现前遵循正确分支策略。

microsoft装→

技能

sync

帮助你同步当前分支与上游分支，完成拉取、变基、推送或发布操作

microsoft装→

# Examples - use project-appropriate command
npm test
cargo test
pytest
go test ./...

New working directory: <full-path>
Tests passing (<N> tests, 0 failures)
All commands and tools will now refer to: <full-path>

pwd  # Should show .worktrees/branch-name in path
git branch  # Should show * on your feature branch, not main

Situation	Action
`.worktrees/` exists	Use it (verify .gitignore)
`.worktree/s does not exist	Check CLAUDE.md → Ask user
Directory not in .gitignore	Add it immediately
Tests fail during baseline	Report failures + ask
No package.json/Cargo.toml	Skip dependency install

using-git-worktrees

// 用法示例

// 文档

// 同源资产

handle-large-tasks

brainstorming

// 功能相似

git-branch

sync

Maintaining Working Directory in Worktree

Quick Reference

Common Mistakes

receiving-code-review

systematic-debugging

testing-anti-patterns

building-ui-ux

Git

github

git-commit

work-item-creation