GIT Merge
Integrate branches with merge or rebase, resolve conflicts, and execute an ordinary...
Install
npx skills add microsoft/hve-core --skill git-merge -g -a claude-code -y- Repository
- microsoft/hve-core1.6k
- Category
- Engineering
- Updated
- 3d ago
- License
- MIT
- Context cost
- Lightabout 588 tokens
- Runs scripts
- No, instructions only
What it does
Integrate branches with merge or rebase, resolve conflicts, and execute an ordinary push when explicitly authorized. Use for guided integration with optional conflict-review pauses.
Git Merge and Rebase
Goal
Run a merge, rebase, or rebase --onto sequence from the current branch with explicit inputs, optional review pauses, and a completion summary. Follow every step even when the repository appears clean so results stay consistent and traceable.
Conventions
Load the git-merge instructions by name and follow their integration, authorization,
account-change, and execution-evidence rules.
Inputs
operation(optional, defaultmerge):merge,rebase, orrebase-onto.branch(required): the branch or ref to merge, or the rebase target. Ask for it when it is missing.onto(required forrebase-onto): the new base.upstream(optional, used byrebase-onto): the branch or commit that bounds the commits to move.conflict-stop(optional, defaultfalse): whentrue, pause after each set of conflict fixes for user review before continuing.
