$ loading_
Merge session branch changes back into the base branch cleanly.
Copy the install command and let the AI configure it · recommended for beginners
Please install the "merge" skill from askskill: 1. Download https://raw.githubusercontent.com/microsoft/vscode/main/src/vs/sessions/skills/merge/SKILL.md 2. Save it as ~/.claude/skills/merge/SKILL.md 3. Reload skills and tell me it's ready
Please merge the code changes from my current session branch back into the base branch and preserve the existing commit history.
A result summary showing the base branch now includes the session branch changes, with any conflicts or merge status noted.
I have fixed the issue in the current branch. Merge these changes back into the base branch and tell me whether the merge succeeded.
The merge execution result and brief confirmation of whether the changes were successfully merged into the base branch.
Please merge all valid changes produced in this session into the base branch so I can continue development.
A status summary showing the base branch after absorbing the session changes, helping the user continue work.
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
Validate Azure DevOps pipeline changes and troubleshoot builds and YAML faster.
Update the GitHub Copilot CLI or SDK to a newer version.
Upgrade Anthropic SDKs, migrate versions, and fix dependency or typing issues.
Generate or update chat customization files for AI coding agents.
Find and read Code OSS dev build logs for faster debugging.
Create and maintain screenshot test fixtures for UI components effectively.
Rebase a stale session branch onto upstream while preserving latest upstream changes.
Update an existing pull request with new changes from the current session
Sync your current branch with upstream by pulling, rebasing, pushing, or publishing.
Create a pull request from the current session's code changes.
Create a draft pull request from the current session’s code changes.
Helps developers finish a branch with merge, PR, or cleanup workflows.