$ loading_
将当前会话分支的修改合并回基础分支，便于整合开发成果。
复制安装指令，让 AI 自动完成配置 · 推荐新手
请帮我安装 askskill 上的 "merge" 技能： 1. 下载 https://raw.githubusercontent.com/microsoft/vscode/main/src/vs/sessions/skills/merge/SKILL.md 2. 保存为 ~/.claude/skills/merge/SKILL.md 3. 装好后重载技能，告诉我可以用了
请将我当前会话分支中的代码变更合并回基础分支，并保留现有提交历史。
基础分支已合并当前会话分支改动的结果说明，必要时提示冲突或合并状态。
我已经在当前分支修复了问题，请把这些改动合并回基础分支，并告诉我是否合并成功。
合并执行结果，以及是否成功并回基础分支的简要反馈。
请将本次会话产生的所有有效改动合并到基础分支，方便我继续后续开发。
基础分支吸收本次会话改动后的状态说明，帮助用户继续后续工作。
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
帮助开发者验证 Azure DevOps 流水线改动，快速排查构建与 YAML 配置问题。
帮助你同步当前分支与上游分支，完成拉取、变基、推送或发布操作