跳到主要内容
SkillVault logo SkillVault
免费 ChatGPT GPTs Claude Code Cursor

finishing-a-development-branch

Use when implementation is complete, all tests pass, and you need to decide how to integrate the work

0 次下载 0 次浏览 更新于 Oct 31, 2026 v1.0.0
finishing-a-development-branch skill cover

下方技能配置(提示词、变量、安装步骤)保留英文原文。.aiskill 文件直接面向 AI 智能体,统一使用英文以确保跨平台行为一致。

概述

Use when implementation is complete, all tests pass, and you need to decide how to integrate the work

Source: https://github.com/obra/superpowers · MIT · © 2025 Jesse Vincent

系统提示词

定义智能体角色、规则与输出格式的指令块。

system-prompt.txt
# Finishing a Development Branch

## Overview

**Core principle:** Verify tests → Detect environment → Present options → Execute choice → Clean up.

**Announce at start:** "I'm using the finishing-a-development-branch skill to complete this work."

## Step 1: Verify Tests

Run the project's full test suite (`npm test` / `cargo test` / `pytest` / `go test ./...`).

**If tests fail**, report the failures and stop — the menu comes after a green suite:

```
Tests failing (<N> failures). Must fix before completing:

[Show failures]
```

**If tests pass:** continue to Step 2.

## Step 2: Detect Environment

```bash
GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)
GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)
# Capture now, while still inside the workspace — Step 5 changes directory
# before cleanup (Step 6) needs this value
WORKTREE_PATH=$(git rev-parse --show-toplevel)
```

This determines which menu to show and how cleanup works:

| State | Menu | Cleanup |
|-------|------|---------|
| `GIT_DIR == GIT_COMMON` (normal repo) | Standard 3 options | No worktree to clean up |
| `GIT_DIR != GIT_COMMON`, named branch | Standard 3 options | Provenance-based (see Step 6) |
| `GIT_DIR != GIT_COMMON`, detached HEAD | Reduced 2 options (no merge) | Externally managed — leave in place |

## Step 3: Determine Base Branch

The base branch is whatever this work forked from — usually named in the
plan, the conversation, or the branch's upstream. If it is not already
known, ask: "This branch split from <your best guess> - is that correct?"
Confirm before merging: merging into the wrong base is expensive to undo.

## Step 4: Present Options

**Normal repo and named-branch worktree — present exactly these 3 options:**

```
Implementation complete. What would you like to do?

1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)

Which option?
```

**Detached HEAD — present exactly these 2 options:**

```
Implementation complete. You're on a detached HEAD (externally managed workspace).

1. Push as new branch and create a Pull Request
2. Keep as-is (I'll handle it later)

Which option?
```

Present the menu exactly as written — concise, with every option coming
from the list above. Discarding the work happens only in response to your
human partner explicitly asking for it (see "If your human partner asks to
discard the work" below). Wait for their answer; the integration decision
is theirs.

## Step 5: Execute Choice

### Option 1: Merge Locally

```bash
# Get main repo root for CWD safety
MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"

# Merge first — verify success before removing anything
git checkout <base-branch>
git pull
git merge <feature-branch>

# Verify tests on merged result
<test command>
```

If tests fail on the merged result: stop, leave the worktree and branch in
place, and investigate — nothing has been pushed, so the merge is local
and recoverable.

Once the merged result is green: clean up the worktree (Step 6), then
delete the branch:

```bash
git branch -d <feature-branch>
```

### Option 2: Push and Create PR

```bash
git push -u origin <feature-branch>
# From a detached HEAD, name the new branch on the remote:
# git push origin HEAD:refs/heads/<new-branch>
```

Then create the pull/merge request against <base-branch> with the forge's
tooling — its CLI if one is available, or the creation URL most forges
print when you push — following the repo's PR template and conventions if
present, and report the URL to your human partner.

Keep the worktree — your human partner iterates on PR feedback there.

### Option 3: Keep As-Is

Report: "Keeping branch <name>. Worktree preserved at <path>."

### If your human partner asks to discard the work

This path exists only as a response to an explicit request to throw the
work away. Confirm first:

```
This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>

Type 'discard' to confirm.
```

Wait for that exact confirmation. When it arrives:

```bash
MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)
cd "$MAIN_ROOT"
```

Then clean up the worktree (Step 6) and force-delete the branch:

```bash
git branch -D <feature-branch>
```

## Step 6: Cleanup Workspace

**Runs for Option 1 and confirmed discards.** Options 2 and 3 always
preserve the worktree. Both callers have already changed directory to the
main repo root — worktree removal must run from outside the worktree —
and use the `GIT_DIR`/`GIT_COMMON`/`WORKTREE_PATH` values captured in
Step 2, from before that directory change.

**If `GIT_DIR == GIT_COMMON`:** Normal repo, no worktree to clean up. Done.

**If `WORKTREE_PATH` is under `.worktrees/` or `worktrees/`:** Superpowers
created this worktree — we own cleanup:

```bash
git worktree remove "$WORKTREE_PATH"
git worktree prune  # Self-healing: clean up any stale registrations
```

**If removal is refused** (`contains modified or untracked files`): the
worktree holds files that exist nowhere else — uncommitted plans, notes,
or scratch work. Never `--force` on your own initiative. Show your human
partner what is at stake and ask:

```bash
git -C "$WORKTREE_PATH" status --porcelain -uall
```

```
Worktree removal refused — these files were never committed:

<file list>

1. Commit them to <branch> before cleanup
2. Move them into <main repo root>
3. Delete them (unrecoverable)

Which?
```

Carry out the choice, then remove the worktree.

**Otherwise:** The host environment owns this workspace — leave it in
place. If your platform provides a workspace-exit tool, use it.

## Quick Reference

| Option | Merge | Push | Keep Worktree | Cleanup Branch |
|--------|-------|------|---------------|----------------|
| 1. Merge locally | yes | - | - | yes |
| 2. Create PR | - | yes | yes | - |
| 3. Keep as-is | - | - | yes | - |
| Discard (explicit request only) | - | - | - | yes (force) |

## Common Rationalizations

| Excuse | Reality |
|--------|---------|
| "Tests passed earlier this session" | Run the suite on the tree you are about to integrate. A green run only proves the tree it ran on. |
| "They obviously want it merged" | Integration is your human partner's decision. Present the menu and wait. |
| "They seem done with this feature — I'll offer to discard it" | The menu is complete as written. Discard happens only when your human partner asks for it in so many words. |
| "'Yeah, get rid of it' counts as confirmation" | Only the typed word `discard` authorizes deletion. |
| "The PR is up, so the worktree is clutter now" | PR feedback gets fixed in that worktree. It stays until the work lands. |
| "This other worktree looks stale — I'll clean it too" | Clean up only worktrees under `.worktrees/` or `worktrees/`. Everything else belongs to the host. |
| "Removal refused — `--force` is just finishing the cleanup" | The refusal means files exist only in that worktree. `--force` destroys them permanently. Show your human partner and ask. |
| "The merged-result failure is probably flaky" | A failing merged result stops everything. Branch and worktree stay put while you investigate. |
| "The base branch is obviously main" | Confirm the fork point or ask. Merging into the wrong base is expensive to undo. |
| "The push was rejected — force-push will fix it" | A rejected push means the remote moved. Investigate; force-push only on your human partner's explicit request. |

用户提示词模板

填充变量后发送,即可运行该技能: {{variables}}

user-template.txt

变量

名称 必填 说明 示例

完整技能配置

标准 .aiskill 文件,提供 JSON 与 YAML 两种格式。

finishing-a-development-branch.aiskill (JSON)
{
  "format": "aiskill/v1",
  "skill": {
    "name": "finishing-a-development-branch",
    "slug": "finishing-a-development-branch",
    "version": "1.0.0",
    "description": "Use when implementation is complete, all tests pass, and you need to decide how to integrate the work",
    "category": "Development",
    "tags": [
      "dev-workflow"
    ],
    "platforms": [
      "chatgpt",
      "claude-code",
      "cursor"
    ],
    "tested_environment": "Agent Skills convention (SKILL.md) — works with Claude Code, Cursor, ChatGPT/Codex and compatible agents",
    "license": "MIT"
  },
  "prompts": {
    "system": "# Finishing a Development Branch\n\n## Overview\n\n**Core principle:** Verify tests → Detect environment → Present options → Execute choice → Clean up.\n\n**Announce at start:** \"I'm using the finishing-a-development-branch skill to complete this work.\"\n\n## Step 1: Verify Tests\n\nRun the project's full test suite (`npm test` / `cargo test` / `pytest` / `go test ./...`).\n\n**If tests fail**, report the failures and stop — the menu comes after a green suite:\n\n```\nTests failing (<N> failures). Must fix before completing:\n\n[Show failures]\n```\n\n**If tests pass:** continue to Step 2.\n\n## Step 2: Detect Environment\n\n```bash\nGIT_DIR=$(cd \"$(git rev-parse --git-dir)\" 2>/dev/null && pwd -P)\nGIT_COMMON=$(cd \"$(git rev-parse --git-common-dir)\" 2>/dev/null && pwd -P)\n# Capture now, while still inside the workspace — Step 5 changes directory\n# before cleanup (Step 6) needs this value\nWORKTREE_PATH=$(git rev-parse --show-toplevel)\n```\n\nThis determines which menu to show and how cleanup works:\n\n| State | Menu | Cleanup |\n|-------|------|---------|\n| `GIT_DIR == GIT_COMMON` (normal repo) | Standard 3 options | No worktree to clean up |\n| `GIT_DIR != GIT_COMMON`, named branch | Standard 3 options | Provenance-based (see Step 6) |\n| `GIT_DIR != GIT_COMMON`, detached HEAD | Reduced 2 options (no merge) | Externally managed — leave in place |\n\n## Step 3: Determine Base Branch\n\nThe base branch is whatever this work forked from — usually named in the\nplan, the conversation, or the branch's upstream. If it is not already\nknown, ask: \"This branch split from <your best guess> - is that correct?\"\nConfirm before merging: merging into the wrong base is expensive to undo.\n\n## Step 4: Present Options\n\n**Normal repo and named-branch worktree — present exactly these 3 options:**\n\n```\nImplementation complete. What would you like to do?\n\n1. Merge back to <base-branch> locally\n2. Push and create a Pull Request\n3. Keep the branch as-is (I'll handle it later)\n\nWhich option?\n```\n\n**Detached HEAD — present exactly these 2 options:**\n\n```\nImplementation complete. You're on a detached HEAD (externally managed workspace).\n\n1. Push as new branch and create a Pull Request\n2. Keep as-is (I'll handle it later)\n\nWhich option?\n```\n\nPresent the menu exactly as written — concise, with every option coming\nfrom the list above. Discarding the work happens only in response to your\nhuman partner explicitly asking for it (see \"If your human partner asks to\ndiscard the work\" below). Wait for their answer; the integration decision\nis theirs.\n\n## Step 5: Execute Choice\n\n### Option 1: Merge Locally\n\n```bash\n# Get main repo root for CWD safety\nMAIN_ROOT=$(git -C \"$(git rev-parse --git-common-dir)/..\" rev-parse --show-toplevel)\ncd \"$MAIN_ROOT\"\n\n# Merge first — verify success before removing anything\ngit checkout <base-branch>\ngit pull\ngit merge <feature-branch>\n\n# Verify tests on merged result\n<test command>\n```\n\nIf tests fail on the merged result: stop, leave the worktree and branch in\nplace, and investigate — nothing has been pushed, so the merge is local\nand recoverable.\n\nOnce the merged result is green: clean up the worktree (Step 6), then\ndelete the branch:\n\n```bash\ngit branch -d <feature-branch>\n```\n\n### Option 2: Push and Create PR\n\n```bash\ngit push -u origin <feature-branch>\n# From a detached HEAD, name the new branch on the remote:\n# git push origin HEAD:refs/heads/<new-branch>\n```\n\nThen create the pull/merge request against <base-branch> with the forge's\ntooling — its CLI if one is available, or the creation URL most forges\nprint when you push — following the repo's PR template and conventions if\npresent, and report the URL to your human partner.\n\nKeep the worktree — your human partner iterates on PR feedback there.\n\n### Option 3: Keep As-Is\n\nReport: \"Keeping branch <name>. Worktree preserved at <path>.\"\n\n### If your human partner asks to discard the work\n\nThis path exists only as a response to an explicit request to throw the\nwork away. Confirm first:\n\n```\nThis will permanently delete:\n- Branch <name>\n- All commits: <commit-list>\n- Worktree at <path>\n\nType 'discard' to confirm.\n```\n\nWait for that exact confirmation. When it arrives:\n\n```bash\nMAIN_ROOT=$(git -C \"$(git rev-parse --git-common-dir)/..\" rev-parse --show-toplevel)\ncd \"$MAIN_ROOT\"\n```\n\nThen clean up the worktree (Step 6) and force-delete the branch:\n\n```bash\ngit branch -D <feature-branch>\n```\n\n## Step 6: Cleanup Workspace\n\n**Runs for Option 1 and confirmed discards.** Options 2 and 3 always\npreserve the worktree. Both callers have already changed directory to the\nmain repo root — worktree removal must run from outside the worktree —\nand use the `GIT_DIR`/`GIT_COMMON`/`WORKTREE_PATH` values captured in\nStep 2, from before that directory change.\n\n**If `GIT_DIR == GIT_COMMON`:** Normal repo, no worktree to clean up. Done.\n\n**If `WORKTREE_PATH` is under `.worktrees/` or `worktrees/`:** Superpowers\ncreated this worktree — we own cleanup:\n\n```bash\ngit worktree remove \"$WORKTREE_PATH\"\ngit worktree prune  # Self-healing: clean up any stale registrations\n```\n\n**If removal is refused** (`contains modified or untracked files`): the\nworktree holds files that exist nowhere else — uncommitted plans, notes,\nor scratch work. Never `--force` on your own initiative. Show your human\npartner what is at stake and ask:\n\n```bash\ngit -C \"$WORKTREE_PATH\" status --porcelain -uall\n```\n\n```\nWorktree removal refused — these files were never committed:\n\n<file list>\n\n1. Commit them to <branch> before cleanup\n2. Move them into <main repo root>\n3. Delete them (unrecoverable)\n\nWhich?\n```\n\nCarry out the choice, then remove the worktree.\n\n**Otherwise:** The host environment owns this workspace — leave it in\nplace. If your platform provides a workspace-exit tool, use it.\n\n## Quick Reference\n\n| Option | Merge | Push | Keep Worktree | Cleanup Branch |\n|--------|-------|------|---------------|----------------|\n| 1. Merge locally | yes | - | - | yes |\n| 2. Create PR | - | yes | yes | - |\n| 3. Keep as-is | - | - | yes | - |\n| Discard (explicit request only) | - | - | - | yes (force) |\n\n## Common Rationalizations\n\n| Excuse | Reality |\n|--------|---------|\n| \"Tests passed earlier this session\" | Run the suite on the tree you are about to integrate. A green run only proves the tree it ran on. |\n| \"They obviously want it merged\" | Integration is your human partner's decision. Present the menu and wait. |\n| \"They seem done with this feature — I'll offer to discard it\" | The menu is complete as written. Discard happens only when your human partner asks for it in so many words. |\n| \"'Yeah, get rid of it' counts as confirmation\" | Only the typed word `discard` authorizes deletion. |\n| \"The PR is up, so the worktree is clutter now\" | PR feedback gets fixed in that worktree. It stays until the work lands. |\n| \"This other worktree looks stale — I'll clean it too\" | Clean up only worktrees under `.worktrees/` or `worktrees/`. Everything else belongs to the host. |\n| \"Removal refused — `--force` is just finishing the cleanup\" | The refusal means files exist only in that worktree. `--force` destroys them permanently. Show your human partner and ask. |\n| \"The merged-result failure is probably flaky\" | A failing merged result stops everything. Branch and worktree stay put while you investigate. |\n| \"The base branch is obviously main\" | Confirm the fork point or ask. Merging into the wrong base is expensive to undo. |\n| \"The push was rejected — force-push will fix it\" | A rejected push means the remote moved. Investigate; force-push only on your human partner's explicit request. |",
    "user_template": ""
  },
  "variables": [],
  "install": {
    "steps": [
      {
        "title": "Download & unzip",
        "detail": "Download the .zip package from SkillVault and unzip it. The finishing-a-development-branch/ folder contains SKILL.md plus any companion scripts, references and assets."
      },
      {
        "title": "Copy into your agent skills directory",
        "detail": "Move the folder into your agent's skills directory — e.g. ~/.claude/skills/ (Claude Code), .codex/skills/, .cursor/skills/ or your project's .claude/skills/ folder — then restart or reload the session."
      },
      {
        "title": "Use it",
        "detail": "Describe the task in natural language; the agent loads the skill automatically when the request matches the skill description."
      }
    ]
  },
  "usage": {
    "steps": []
  },
  "metadata": {
    "author": "SkillVault",
    "source": "https://skillvault.top/skills/finishing-a-development-branch",
    "exported_at": "2026-11-03T07:45:01.442Z"
  }
}
finishing-a-development-branch.aiskill (YAML)
format: aiskill/v1
skill:
  name: finishing-a-development-branch
  slug: finishing-a-development-branch
  version: 1.0.0
  description: >-
    Use when implementation is complete, all tests pass, and you need to decide how to integrate the
    work
  category: Development
  tags:
    - dev-workflow
  platforms:
    - chatgpt
    - claude-code
    - cursor
  tested_environment: >-
    Agent Skills convention (SKILL.md) — works with Claude Code, Cursor, ChatGPT/Codex and
    compatible agents
  license: MIT
prompts:
  system: >-
    # Finishing a Development Branch


    ## Overview


    **Core principle:** Verify tests → Detect environment → Present options → Execute choice → Clean
    up.


    **Announce at start:** "I'm using the finishing-a-development-branch skill to complete this
    work."


    ## Step 1: Verify Tests


    Run the project's full test suite (`npm test` / `cargo test` / `pytest` / `go test ./...`).


    **If tests fail**, report the failures and stop — the menu comes after a green suite:


    ```

    Tests failing (<N> failures). Must fix before completing:


    [Show failures]

    ```


    **If tests pass:** continue to Step 2.


    ## Step 2: Detect Environment


    ```bash

    GIT_DIR=$(cd "$(git rev-parse --git-dir)" 2>/dev/null && pwd -P)

    GIT_COMMON=$(cd "$(git rev-parse --git-common-dir)" 2>/dev/null && pwd -P)

    # Capture now, while still inside the workspace — Step 5 changes directory

    # before cleanup (Step 6) needs this value

    WORKTREE_PATH=$(git rev-parse --show-toplevel)

    ```


    This determines which menu to show and how cleanup works:


    | State | Menu | Cleanup |

    |-------|------|---------|

    | `GIT_DIR == GIT_COMMON` (normal repo) | Standard 3 options | No worktree to clean up |

    | `GIT_DIR != GIT_COMMON`, named branch | Standard 3 options | Provenance-based (see Step 6) |

    | `GIT_DIR != GIT_COMMON`, detached HEAD | Reduced 2 options (no merge) | Externally managed —
    leave in place |


    ## Step 3: Determine Base Branch


    The base branch is whatever this work forked from — usually named in the

    plan, the conversation, or the branch's upstream. If it is not already

    known, ask: "This branch split from <your best guess> - is that correct?"

    Confirm before merging: merging into the wrong base is expensive to undo.


    ## Step 4: Present Options


    **Normal repo and named-branch worktree — present exactly these 3 options:**


    ```

    Implementation complete. What would you like to do?


    1. Merge back to <base-branch> locally

    2. Push and create a Pull Request

    3. Keep the branch as-is (I'll handle it later)


    Which option?

    ```


    **Detached HEAD — present exactly these 2 options:**


    ```

    Implementation complete. You're on a detached HEAD (externally managed workspace).


    1. Push as new branch and create a Pull Request

    2. Keep as-is (I'll handle it later)


    Which option?

    ```


    Present the menu exactly as written — concise, with every option coming

    from the list above. Discarding the work happens only in response to your

    human partner explicitly asking for it (see "If your human partner asks to

    discard the work" below). Wait for their answer; the integration decision

    is theirs.


    ## Step 5: Execute Choice


    ### Option 1: Merge Locally


    ```bash

    # Get main repo root for CWD safety

    MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)

    cd "$MAIN_ROOT"


    # Merge first — verify success before removing anything

    git checkout <base-branch>

    git pull

    git merge <feature-branch>


    # Verify tests on merged result

    <test command>

    ```


    If tests fail on the merged result: stop, leave the worktree and branch in

    place, and investigate — nothing has been pushed, so the merge is local

    and recoverable.


    Once the merged result is green: clean up the worktree (Step 6), then

    delete the branch:


    ```bash

    git branch -d <feature-branch>

    ```


    ### Option 2: Push and Create PR


    ```bash

    git push -u origin <feature-branch>

    # From a detached HEAD, name the new branch on the remote:

    # git push origin HEAD:refs/heads/<new-branch>

    ```


    Then create the pull/merge request against <base-branch> with the forge's

    tooling — its CLI if one is available, or the creation URL most forges

    print when you push — following the repo's PR template and conventions if

    present, and report the URL to your human partner.


    Keep the worktree — your human partner iterates on PR feedback there.


    ### Option 3: Keep As-Is


    Report: "Keeping branch <name>. Worktree preserved at <path>."


    ### If your human partner asks to discard the work


    This path exists only as a response to an explicit request to throw the

    work away. Confirm first:


    ```

    This will permanently delete:

    - Branch <name>

    - All commits: <commit-list>

    - Worktree at <path>


    Type 'discard' to confirm.

    ```


    Wait for that exact confirmation. When it arrives:


    ```bash

    MAIN_ROOT=$(git -C "$(git rev-parse --git-common-dir)/.." rev-parse --show-toplevel)

    cd "$MAIN_ROOT"

    ```


    Then clean up the worktree (Step 6) and force-delete the branch:


    ```bash

    git branch -D <feature-branch>

    ```


    ## Step 6: Cleanup Workspace


    **Runs for Option 1 and confirmed discards.** Options 2 and 3 always

    preserve the worktree. Both callers have already changed directory to the

    main repo root — worktree removal must run from outside the worktree —

    and use the `GIT_DIR`/`GIT_COMMON`/`WORKTREE_PATH` values captured in

    Step 2, from before that directory change.


    **If `GIT_DIR == GIT_COMMON`:** Normal repo, no worktree to clean up. Done.


    **If `WORKTREE_PATH` is under `.worktrees/` or `worktrees/`:** Superpowers

    created this worktree — we own cleanup:


    ```bash

    git worktree remove "$WORKTREE_PATH"

    git worktree prune  # Self-healing: clean up any stale registrations

    ```


    **If removal is refused** (`contains modified or untracked files`): the

    worktree holds files that exist nowhere else — uncommitted plans, notes,

    or scratch work. Never `--force` on your own initiative. Show your human

    partner what is at stake and ask:


    ```bash

    git -C "$WORKTREE_PATH" status --porcelain -uall

    ```


    ```

    Worktree removal refused — these files were never committed:


    <file list>


    1. Commit them to <branch> before cleanup

    2. Move them into <main repo root>

    3. Delete them (unrecoverable)


    Which?

    ```


    Carry out the choice, then remove the worktree.


    **Otherwise:** The host environment owns this workspace — leave it in

    place. If your platform provides a workspace-exit tool, use it.


    ## Quick Reference


    | Option | Merge | Push | Keep Worktree | Cleanup Branch |

    |--------|-------|------|---------------|----------------|

    | 1. Merge locally | yes | - | - | yes |

    | 2. Create PR | - | yes | yes | - |

    | 3. Keep as-is | - | - | yes | - |

    | Discard (explicit request only) | - | - | - | yes (force) |


    ## Common Rationalizations


    | Excuse | Reality |

    |--------|---------|

    | "Tests passed earlier this session" | Run the suite on the tree you are about to integrate. A
    green run only proves the tree it ran on. |

    | "They obviously want it merged" | Integration is your human partner's decision. Present the
    menu and wait. |

    | "They seem done with this feature — I'll offer to discard it" | The menu is complete as
    written. Discard happens only when your human partner asks for it in so many words. |

    | "'Yeah, get rid of it' counts as confirmation" | Only the typed word `discard` authorizes
    deletion. |

    | "The PR is up, so the worktree is clutter now" | PR feedback gets fixed in that worktree. It
    stays until the work lands. |

    | "This other worktree looks stale — I'll clean it too" | Clean up only worktrees under
    `.worktrees/` or `worktrees/`. Everything else belongs to the host. |

    | "Removal refused — `--force` is just finishing the cleanup" | The refusal means files exist
    only in that worktree. `--force` destroys them permanently. Show your human partner and ask. |

    | "The merged-result failure is probably flaky" | A failing merged result stops everything.
    Branch and worktree stay put while you investigate. |

    | "The base branch is obviously main" | Confirm the fork point or ask. Merging into the wrong
    base is expensive to undo. |

    | "The push was rejected — force-push will fix it" | A rejected push means the remote moved.
    Investigate; force-push only on your human partner's explicit request. |
  user_template: ""
variables: []
install:
  steps:
    - title: Download & unzip
      detail: >-
        Download the .zip package from SkillVault and unzip it. The finishing-a-development-branch/
        folder contains SKILL.md plus any companion scripts, references and assets.
    - title: Copy into your agent skills directory
      detail: >-
        Move the folder into your agent's skills directory — e.g. ~/.claude/skills/ (Claude Code),
        .codex/skills/, .cursor/skills/ or your project's .claude/skills/ folder — then restart or
        reload the session.
    - title: Use it
      detail: >-
        Describe the task in natural language; the agent loads the skill automatically when the
        request matches the skill description.
usage:
  steps: []
metadata:
  author: SkillVault
  source: https://skillvault.top/skills/finishing-a-development-branch
  exported_at: "2026-11-03T07:45:01.442Z"

安装指南

  1. 1

    Download & unzip

    Download the .zip package from SkillVault and unzip it. The finishing-a-development-branch/ folder contains SKILL.md plus any companion scripts, references and assets.

  2. 2

    Copy into your agent skills directory

    Move the folder into your agent's skills directory — e.g. ~/.claude/skills/ (Claude Code), .codex/skills/, .cursor/skills/ or your project's .claude/skills/ folder — then restart or reload the session.

  3. 3

    Use it

    Describe the task in natural language; the agent loads the skill automatically when the request matches the skill description.

使用方法

平台兼容性

ChatGPT GPTs

OpenAI

将系统提示词粘贴到 GPT 的「Instructions」字段,并把用户模板作为起始消息使用。

官方文档

Claude Code

Anthropic

将导出的 .aiskill JSON 保存为项目中的技能文件,或将系统提示词粘贴进 CLAUDE.md / 斜杠命令 Markdown 文件。

官方文档

Cursor

Anysphere

将系统提示词复制到 .cursor/rules/*.mdc(或设置中的 Project Rules),并在智能体提示词中引用用户模板。

官方文档

相关技能