Skip to content
cccskills
FreePublished on GitHub

git-merge

Coordinate Git merge, rebase, and rebase --onto workflows with conflict resolution, optional review pauses, and a completion summary. Use when integrating a branch locally and resolving conflicts without pushing.

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md2.7 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

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

The git-merge instructions own workspace preparation, the operation commands, conflict resolution, finishing steps, and the no-push guardrail. Apply them at every step below.

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 git-merge instructions 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 instructions 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 instructions define, or abort when the user directs it.
  6. Summarize the operation, each conflict and how it was resolved with linked files, the stash state, and any remaining manual follow-up. Remind the user that nothing was pushed and that they publish the branch when ready.

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 user received a conflict summary with linked files and a reminder that pushing remains their responsibility.

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Consolidated accessibility skill entrypoint for WCAG 2.2, ARIA Authoring Practices, cognitive accessibility, Section 508, EN 301 549, design intent verification, and the Accessibility Planner workflow.

The English summary is being prepared. Showing the original description.

microsoft/hve-core1.5KUpdated Oct 20, 2026

Build, refresh, report, or probe an accessibility coverage matrix across criteria, surfaces, and evidence methods. Use when assessing coverage with the accessibility runtime harness and generated evidence bundle.

The English summary is being prepared. Showing the original description.

microsoft/hve-core1.5KUpdated Oct 20, 2026

Authoring skill for Architecture Decision Records (ADRs) supporting capture, from-planner-handoff, and adopt-template entry modes with selectable Y-Statement or MADR v4.0.0 output templates, supersession lineage, and ASR trigger evaluation.

The English summary is being prepared. Showing the original description.

microsoft/hve-core1.5KUpdated Oct 20, 2026

Authoring conventions for exploratory data analysis notebooks and analytical dashboards, covering section sequence, visualization selection, scale thresholds, caching and state, and dashboard validation budgets. Use when composing or reviewing an EDA notebook, an analytical dashboard, or a dashboard test pass.

The English summary is being prepared. Showing the original description.

microsoft/hve-core1.5KUpdated Oct 20, 2026

Architecture diagram authoring for cloud infrastructure and declared data catalogs. Use when rendering Azure IaC or DS_CATALOG_V1 relationships as caller-selected ASCII or Mermaid diagrams.

The English summary is being prepared. Showing the original description.

microsoft/hve-core1.5KUpdated Oct 20, 2026

Create a durable Architecture Review Record from a confirmed System Architecture Reviewer scope, evidence, pillar analysis, trade-offs, and dispositions

The English summary is being prepared. Showing the original description.

microsoft/hve-core1.5KUpdated Oct 20, 2026

See all skills by microsoft

Report a problem with this skill