Merge an upstream branch into a Roslyn repository base branch.
npx skills add https://github.com/CoolCoderSuper/vb-ls --skill merge-into-branch
Please help me install this Agent Skill. Skill: merge-into-branch Source: https://github.com/CoolCoderSuper/vb-ls/tree/main/roslyn/.github/skills/merge-into-branch Command: npx skills add https://github.com/CoolCoderSuper/vb-ls --skill merge-into-branch
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.
Provide the base and upstream branch names, then run the merge workflow and review conflicts before finalizing the merge.
High-intent search queries and answers about installing and using this skill.
To resolve Roslyn conflicts when merging a source branch into a base branch, this workflow creates a dedicated merge branch, initiates the merge, and automatically resolves .xlf, .resx, and compiler-generated conflicts. It then produces a concise summary of the resolutions to guide finalizing the merge.
The best way to prepare a release or servicing branch merge in a Roslyn-based repository is to create a dedicated merge branch from your chosen base. This cleanly merges the upstream branch and resolves Roslyn-specific conflict patterns, ensuring a clean state before finalizing the PR.
You can merge an upstream branch by providing the base branch, source ref, and merge-branch name. The workflow runs the merge process, resolves Roslyn-specific conflicts, and produces a concise resolution summary to guide PR creation.
Yes, you can use this merge workflow for resolving .xlf and .resx file conflicts. It specifically targets Roslyn localization and compiler-generation patterns, automatically resolving these common conflict types while merging your source branch into the target base.
The merge process does not finalize automatically; you need to review conflicts before completing the merge. The workflow includes a plan to review the generated conflict resolutions and summary before you finalize the merge state and create a PR.
To start a branch merge and resolve Roslyn-specific conflicts, you need to provide the base branch name, the source or upstream ref, and the desired merge-branch name. These inputs initiate the merge workflow and conflict resolution process.
OpenAuthorityMerge a specified branch into the current git branch and report conflicts.
catu-aiMerge an approved pull request after confirming an archived harness plan.
YoshikemoloGenerate Git branch names and validate commit messages against Jira issues.
CuriousLearnerAnalyze Git merge conflict types and propose automated or manual resolution strategies.
