메뉴
Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
Agents window architecture — covers the agents-first app, layering, folder structure, chat widget, menus, contributions, entry points, and development guidelines. Use when implementing features or fixing issues in the Agents window.
Use when adding, modifying, or reviewing VS Code configuration policies. Covers the full policy lifecycle from registration to export to platform-specific artifacts. Run on ANY change that adds a `policy:` field to a configuration property.
Act on user feedback attached to the current session. Use when the user submits feedback on the session's changes via the Submit Feedback button.
Use when running VS Code smoke tests or working on smoke-test CI steps. Covers npm run smoketest / smoketest-no-compile, grep filtering tests, and a temporary repeat-loop technique for tracking down flaky smoke tests in CI.
Use when working on the Chat Customizations editor — the management UI for agents, skills, instructions, hooks, prompts, MCP servers, and plugins.
Investigate and fix CI failures on a pull request. Use when CI checks fail on a PR branch — covers finding the PR, identifying failed checks, downloading logs and artifacts, extracting the failure cause, and iterating on a fix. Requires the `gh` CLI.
| name | merge |
| description | Merge changes from the topic branch to the merge base branch. Use when the user wants to merge their session's work back to the base branch. |
Merge the topic branch (checked out in the current worktree) into the merge base branch (checked out in the main worktree). The context block appended to the prompt contains the source branch, target branch, and main worktree path.
--force, --force-with-lease) without explicit user approval.--no-verify).Check for uncommitted changes in the current worktree:
git status --porcelain
If there are uncommitted changes, use the /commit skill to commit them before continuing.
Use git -C <main-worktree-path> to run commands against the main worktree without leaving the current worktree.
git -C <main-worktree-path> merge <topic-branch>
If the merge reports conflicts:
3.1. List conflicted files:
git -C <main-worktree-path> diff --name-only --diff-filter=U
3.2. For each conflicted file, read the file content, resolve the conflict by preserving the intent of both sides, and stage the resolved file:
git -C <main-worktree-path> add <resolved-file>
3.3. When in doubt on how to resolve a merge conflict, ask the user for guidance. If the user wants to abort, run:
git -C <main-worktree-path> merge --abort
3.4. Once all conflicts are resolved and staged, commit the merge:
git -C <main-worktree-path> commit --no-edit
After the merge completes, verify the result:
git -C <main-worktree-path> status --porcelain
git -C <main-worktree-path> merge-base --is-ancestor <topic-branch> HEAD