本文へ移動
cccskills
無料GitHub で公開

resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

インストール方法を見る

含まれるファイル(1)

  • SKILL.md981 B

SKILL.md(原文)

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

  1. See the current state of the merge/rebase. Check git history, and the conflicting files.

  2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

  3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.

  4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

  5. Finish the merge/rebase. Stage everything and commit (use the git-commiter skill for the merge-commit message). If rebasing, continue the rebase process until all commits are rebased.

レビュー

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

同じリポジトリのスキル

概要と使いどころ

Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes — Standards (does the code follow this repo's documented coding standards?) and Spec (does the code match what the originating issue/spec asked for?). Runs both reviews in parallel sub-agents and reports them side by side. Use when the user wants to review a branch, a PR, work-in-progress changes, or asks to "review since X".

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

nmdra/Dotfiles282026年8月11日 更新

Execute git commits using the Conventional Commits specification. Use this skill whenever the user says "commit", "git commit", "/commit", "stage and commit", "make a commit", "save my changes", or asks to commit specific files or all changes. Also triggers on phrases like "push my changes" (commit first), "commit everything", "commit with message X", or whenever git diff/status suggests uncommitted work the user wants to save. Handles auto-staging, diff analysis, message generation, breaking change detection, batch splitting of unrelated changes, safe pushes, and pre-commit hook failures gracefully. Always use this skill rather than ad-hoc git commit commands.

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

nmdra/Dotfiles282026年8月11日 更新

graphify

無料

Use for any question about a codebase, its architecture, file relationships, or project content — especially when graphify-out/ exists, where the question should be treated as a graphify query first. Turns any input (code, docs, papers, images, videos) into a persistent knowledge graph with god nodes, community detection, and query/path/explain tools.

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

nmdra/Dotfiles282026年8月11日 更新

grilling

無料

Grill the user relentlessly about a plan, decision, or idea. Use when the user wants to stress-test their thinking, or uses any 'grill' trigger phrases.

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

nmdra/Dotfiles282026年8月11日 更新

implement

無料

Implement a piece of work based on a spec or set of tickets.

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

nmdra/Dotfiles282026年8月11日 更新

Maintain CHANGELOG.md — add new version entries, keep the Unreleased section, cut a release, or restructure the whole file — following the Keep a Changelog format and Semantic Versioning.

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

nmdra/Dotfiles282026年8月11日 更新

nmdra のスキルをすべて見る

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