AutoGineer
Generated banner for Git Merge
Generated logo for Git Merge

Git Merge

MicrosoftOfficialPublished by Microsoft

  • Skill
  • Tool integration
  • Software development
  • MIT
  • No issues found
Download ZIP

From the author

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.
— the description by Microsoft

AutoGineer summary

Written by AutoGineer from the skill’s own files, not by the author

The git-merge skill provides a structured, traceable process for integrating branches using merge or rebase operations. It enforces best practices by ensuring the working tree is clean before starting, documenting conflict resolutions with rationales, and providing an optional pause for user review during complex conflict resolution. The skill supports standard merges, rebases, and rebase-onto operations, and handles push authorization explicitly to prevent unauthorized remote history changes.

What it does

  • Performs git merge, rebase, or rebase-onto operations.
  • Ensures a clean working tree by stashing local changes before integration.
  • Provides a guided conflict resolution process with documentation of rationales.
  • Offers an optional conflict-stop mode to pause for user review after resolving conflicts.
  • Summarizes integration results, including conflict resolutions and stash states.
  • Executes authorized pushes only when explicitly requested by the user.

When to use it

  • When you need to integrate changes from one branch into another.
  • When you anticipate complex merge conflicts that require careful review.
  • When you need to maintain a clean, documented history of integration steps.
  • When you want to perform a rebase-onto operation to move a specific range of commits.

Advantages

  • Reduces errors through a standardized, step-by-step integration workflow.
  • Improves traceability by requiring rationales for conflict resolutions.
  • Prevents accidental pushes by requiring explicit authorization.
  • Provides flexibility with optional review pauses during conflict resolution.

Usage examples

“Merge the feature-login branch into main.”
The agent will prepare the workspace, perform the merge, resolve any conflicts, and provide a summary of the integration.
“Rebase my current branch onto develop with conflict-stop enabled.”
The agent will initiate the rebase and pause after resolving conflicts to allow you to review the changes before continuing.

Install

  1. Download the skill as a ZIP:

    https://mp-staging.autogineer.com/agent-skills/microsoft/git-merge/download

  2. Unzip it into the cross-client skills folder of your project:

    mkdir -p .agents/skills && unzip git-merge.zip -d .agents/skills

Documentation by Microsoft

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

Read references/merge-conventions.md and follow its 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

  1. Resolve the inputs. Ask for branch when it is missing, and for onto when operation is rebase-onto. Record the active branch and the inputs.

  2. Prepare the workspace as the merge conventions define, then run the command they define for the selected operation and capture its output. Without conflicts, continue at step 5.

  3. Resolve conflicts as the conventions define, and keep each file's resolution and rationale for the summary.

  4. Honor review pauses. When conflict-stop is true, summarize the fixes with a checklist of touched files and wait for explicit user confirmation before continuing. Answer follow-up questions and adjust resolutions from user feedback.

  5. Continue or complete the operation as the conventions define, or abort when the user directs it.

  6. Execute an authorized ordinary push under those conventions; otherwise leave the result local without soliciting publishing approval. Summarize the integration, linked conflict resolutions, stash state, actual push/account-cleanup outcomes when applicable, and remaining follow-up.

Success Criteria

  • The operation path completed with every conflict resolved, or was aborted at the user's direction.

  • git status --short reports no pending changes, or the summary names deliberate follow-up items.

  • The summary links conflict resolutions and accurately reports integration and any authorized push or account cleanup.

Files

Requirements and compatibility

Written for: GitHub Copilot, Claude Code

Works with: Claude Code, Claude apps, OpenAI Codex, GitHub Copilot, Cursor, Gemini CLI, Kiro, OpenCode, Goose, Amp, Roo Code, JetBrains Junie, Factory Droid, Devin (ex-Windsurf), Mistral Vibe, OpenHands, Letta

“Works with” means the tool reads the open Agent Skills format; a skill written for one tool may use features others lack.

Needs: Claude Code frontmatter

Security

No issues found by our static scan· No issues found

A static scan is not a guarantee. Skills are third-party content: review a skill before you let an agent use it.

Attribution and licence

Published by
Microsoft
Publisher
Microsoft (Official)
Source
microsoft/hve-core · .github/skills/hve-core/git-merge · commit f425e94
Licence
MIT License (redistribution allowed)
  • LICENSE (added by AutoGineer from LICENSE)
  • ATTRIBUTION.md (written by AutoGineer)
Synced

AutoGineer is not affiliated with or endorsed by Microsoft.

Download ZIP

The ZIP holds the skill’s files, its licence files and an ATTRIBUTION.md. Download git-merge.zip