merge-into-branch
Merge Into Branch
Use this skill when you need to merge one branch into another in dotnet/roslyn; for example, merging main into a release or servicing branch, or merging any other source branch into a target branch.
IMPORTANT: This workflow changes local git state by creating a branch, performing a merge, resolving conflicts, and producing a merge commit. Confirm the repo clone, base branch, upstream branch, and merge-branch name before making changes. If the working tree is dirty, stop and ask whether to continue in a clean worktree.
SKILL MAINTENANCE: If the actual merge process differs from this skill or a new Roslyn-specific conflict pattern shows up, remind the user to update this skill so future merges benefit from the fix.
When to Use This Skill
Use this skill when:
- Merging one branch into another branch
- Preparing a release, dev, or servicing branch to receive a merge
- Creating a one-off merge branch to prepare a PR
- Resolving Roslyn-specific localization or compiler-generation conflicts during a merge
Do not use this for a full branch snap workflow involving milestone movement, darc subscription changes, or release-train coordination. Use the snap skill for that.