本文へ移動
cccskills
無料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.

インストール方法を見る

含まれるファイル(1)

  • SKILL.md2.7 KB

SKILL.md(原文)

インストールする前に、エージェントに与えられる指示の中身を確認できます。

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.

レビュー

まだレビューはありません。使ってみた感想をお寄せください。

同じリポジトリのスキル

概要と使いどころ

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.

日本語の概要は準備中です。原文の説明を表示しています。

microsoft/hve-core1,5182026年10月10日 更新

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.

日本語の概要は準備中です。原文の説明を表示しています。

microsoft/hve-core1,5182026年10月10日 更新

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.

日本語の概要は準備中です。原文の説明を表示しています。

microsoft/hve-core1,5182026年10月10日 更新

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.

日本語の概要は準備中です。原文の説明を表示しています。

microsoft/hve-core1,5182026年10月10日 更新

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.

日本語の概要は準備中です。原文の説明を表示しています。

microsoft/hve-core1,5182026年10月10日 更新

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

日本語の概要は準備中です。原文の説明を表示しています。

microsoft/hve-core1,5182026年10月10日 更新

microsoft のスキルをすべて見る

このスキルの問題を報告する