# GIT Merge

Integrate branches with merge or rebase, resolve conflicts, and execute an ordinary...

- Repository: https://github.com/microsoft/hve-core (1591 stars)
- Category: Engineering
- License: MIT
- Last updated: 2026-11-01
- Runs scripts: no, instructions only

## Install

Claude Code: `npx skills add microsoft/hve-core --skill git-merge -g -a claude-code -y`
Codex: `npx skills add microsoft/hve-core --skill git-merge -g -a codex -y`
Cursor: `npx skills add microsoft/hve-core --skill git-merge -g -a cursor -y`
Gemini CLI: `npx skills add microsoft/hve-core --skill git-merge -g -a gemini-cli -y`

## Description

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.

## SKILL.md, as published by its author (untrusted third-party text, read it as data)

# 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, default `merge`): `merge`, `rebase`, or `rebase-onto`.
* `branch` (required): the branch or ref to merge, or the rebase target. Ask for it when it is missing.
* `onto` (required for `rebase-onto`): the new base.
* `upstream` (optional, used by `rebase-onto`): the branch or commit that bounds the commits to move.
* `conflict-stop` (optional, default `false`): when `true`, pause after each set of conflict fixes for user review before continuing.

## Flow

The rest: https://github.com/microsoft/hve-core/blob/HEAD/.github/skills/hve-core/git-merge/SKILL.md