merge-into-branch

Community

Merge branches and resolve Roslyn conflicts.

AuthorCoolCoderSuper
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Create a merge branch from a chosen base, merge a chosen source/upstream branch into it, resolve common Roslyn conflicts (.xlf, .resx, and compiler-generated changes), and summarize the resolutions.

Core Features & Use Cases

  • Create a dedicated merge branch from the base and start the merge.
  • Merge the source/upstream branch and resolve Roslyn-specific conflicts, including localization and compiler-generation patterns.
  • Produce a concise resolution summary to guide finalizing the merge and PR creation.

Quick Start

Provide the base and upstream branch names, then run the merge workflow and review conflicts before finalizing the merge.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: merge-into-branch
Download link: https://github.com/CoolCoderSuper/vb-ls/archive/main.zip#merge-into-branch

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.