「conflict」の検索結果

Git branching strategies, conflict resolution, rebase workflows, monorepo patterns, and advanced operations like cherry-pick, bisect, and reflog recovery. Activate on "git", "branching strategy", "merge conflict", "rebase", "cherry-pick", "monorepo git", "git bisect", "git reflog", "squash commits". NOT for GitHub Actions CI/CD (use github-actions-pipeline-builder), GitHub API/webhooks, or PR review processes (use code-review-checklist).

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

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

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

[Git] Use when you need to resolve git merge/cherry-pick/rebase conflicts with backup, analysis, and reporting.

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

Triage a single GitHub PR by PR number. Check out the PR's branch, detect conflicts with the target branch via `gh pr status` (and label the PR with `cc-resolve-conflict` if any are found), generate and evaluate a fix plan via create-review-fix-plan, then take action (add cc-fix-onetime label if fixes are needed, or merge the PR if it's ready).

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

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

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

Foundational ethics, authority hierarchy, and structural principles for the Predicate agent. Always-on law (composable system-prompt core): Truth>Harmony, Evidence>Authority, Halt>Assumption, Outcomes>Process — four ordered principles that govern every walk. Reference (by-moment): conflict resolution, ethics adjudication, novel situations, precedence walkthrough, entropy diagnostics, principled resistance. Trigger (reference depth): resolving rule conflicts, ethics calls, novel situations. Prompt contains: constitution, principles, precedence, truth over harmony, outcomes over process, evidence over authority, principled resistance.

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

feature ready と task ready を分離したいとき、依存・tracker parity・resource scope・active lease を満たす conflict-free batch を算出したいときに使う。

Dependency-conflict resolution when a `fix` version bump fails — diagnose the peer-dep tree, find a compatible safe version set, propose package-manager overrides (`overrides`/`resolutions`/`replace`/`[patch]`), fall back to safe-harbour inline patching. Use when an upgrade is blocked by transitive constraints, a peer-dep conflict surfaces, or you need to override a vulnerable transitive without bumping the parent.

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

Git 運用の規律 (branch / worktree 運用、commit / push / pull / rebase / conflict 解決、remote 同期、完了時の統合) を一元的に担う skill。コード変更を伴う依頼・セッション開始・Git 操作の話題のいずれかに該当したら、他より先に必ず最初に使う。ファイルを 1 行でも書き換える依頼なら Git に無関係に見えても発火し、セッション開始・作業再開 (「前回の続き」「何から始めよう」等) でも必ず発火する。発火しないのはコードを読むだけの質問、Git の概念学習質問、doc のサマリ依頼。project 固有ルールでの部分上書きに対応する。

Reviews a set of knowledge files or a knowledge base listing and returns a draft hygiene table, one row per file: duplication signals with the matching file, staleness signals, conflicts between files on the same topic with both passages quoted, missing or unverified owners, and one proposed action per file (Keep, Update, Merge into, Retire, Assign owner, Confirm with owner) for the owner to decide. Never edits, merges, moves or deletes a file. Use when the user asks to "review our knowledge base for duplicates", "which KB articles are stale", "find conflicting articles", "which articles have no owner" or "run a hygiene check on these files". Do not use for review-date sweeps of a document library with owner reminders, use sharepoint-review-sweeper instead; for writing one article, use knowledge-article-drafter. Drafts for human review; never approves, authorises or signs off.

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

Complete Flutter SDK installation, IDE configuration, and troubleshooting guide for Linux, macOS, and Windows. Use for installing Flutter SDK from scratch, configuring PATH environment variables across platforms, setting up VS Code/Android Studio/IntelliJ IDEA with Flutter plugins, resolving 'flutter command not found' errors, fixing flutter doctor warnings and errors, troubleshooting Android SDK/NDK installation issues, configuring Xcode and CocoaPods on macOS, installing Visual Studio C++ build tools on Windows, resolving PATH conflicts and SDK path issues, fixing network/proxy setup problems, debugging IDE plugin activation, configuring emulators and simulators, handling platform-specific build errors, resolving dependency conflicts, fixing certificate and signing issues, troubleshooting hot reload failures, and verifying successful installation with flutter doctor diagnostics.

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

Detects MSBuild projects with conflicting OutputPath or IntermediateOutputPath. Only activate in MSBuild/.NET build context. USE FOR: builds failing with 'Cannot create a file when that file already exists', 'The process cannot access the file because it is being used by another process', intermittent build failures that succeed on retry, missing outputs in multi-project builds, multi-targeting builds where project.assets.json conflicts. Diagnoses when multiple projects or TFMs write to the same bin/obj directories due to shared OutputPath, missing AppendTargetFrameworkToOutputPath, or extra global properties like PublishReadyToRun creating redundant evaluations. DO NOT USE FOR: file access errors unrelated to MSBuild (OS-level locking), single-project single-TFM builds, non-MSBuild build systems. INVOKES: binlog MCP server tools (overview, projects, evaluations, properties, double_writes); falls back to dotnet msbuild binlog replay + grep when the MCP is unavailable.

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

Validates custom dotnet new templates for correctness before publishing. Catches missing fields, parameter bugs, shortName conflicts, constraint issues, and common authoring mistakes that cause templates to fail silently. USE FOR: checking template.json files for errors before publishing or testing, diagnosing why a template doesn't appear after installation, reviewing template parameter definitions for type mismatches and missing defaults, finding shortName conflicts with dotnet CLI commands, validating post-action and constraint configuration. DO NOT USE FOR: finding or using existing templates (use template-discovery), creating projects from templates (use template-instantiation), creating templates from existing projects (use template-authoring).

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

Wire builders' isolated tdmcp tool files into the shared registries, CLI, and docs as a single writer, conflict-safe, and confirm a green typecheck + build. Use when integrating/wiring/registering new tdmcp tools, adding their CLI commands, resolving build breaks after parallel feature work, or merging several builders' files into the registry without conflicts.

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

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

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

Detect EADDRINUSE and port conflicts, find what's using the port, and resolve it by killing the process or suggesting an alternative port.

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

pen.dev CLI（`pencil` / `pen`コマンド）だけを使って.penファイル（pen.devで作成されたデザインファイル）をAIプロンプトまたは決定論的な編集操作で修正・更新・新規作成するスキル。.penファイルの編集、ボタン追加、レイアウト変更、UIデザインの調整、pen.devデザインの更新、新しい.penデザインの作成などの依頼で必ず使用する。AI任せの編集・新規作成はエージェントモード（`pencil --in --out --prompt`）で行い、既存ファイルは同一パスを指定して上書き、新規作成は`--in`を省略して`--out`に新しいパスを指定する。決定論的な編集はインタラクティブモード（`pencil interactive`）の`execute`（`Insert` / `Update` / `Delete` など）で行い、最後に`save()`する。編集・作成後は「**編集・作成したコンポーネントのNodeだけ**」を`execute`の`Export` / `TakeScreenshot`でPNG出力し、`.pen`と同階層の`snapshots/`ディレクトリに保存する。pen.dev MCPには依存せず`pencil`コマンドのみで完結する。.penファイルのgitコンフリクト解消・破損復旧は本スキルではなく`resolve-pencil-conflict`スキルの担当。

Triage a single GitHub PR by PR number. Check out the PR's branch, detect conflicts with the target branch via `gh pr status` (and label the PR with `cc-resolve-conflict` if any are found), collect unresolved review comments and CI status and judge only whether each item must be fixed, then take action (add cc-fix-onetime label if fixes are needed; if release-ready, add cc-release-ready label for an Epic PR marked `cc-epic-issue` instead of merging, otherwise merge the PR).

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

Manage source control effectively with Git including branching strategies, commit conventions, merge conflict resolution, rebasing, and collaboration workflows like GitHub Flow or GitFlow. Use when managing feature branches, creating meaningful commits, resolving merge conflicts, rebasing branches, squashing commits, using interactive rebase, implementing branch naming conventions, following commit message standards, managing pull requests, or collaborating in team environments.

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

Skill manifest management for dotnet-harness. Tracks skill dependencies, conflicts, version compatibility, and provides validation and resolution tools. Triggers on: skill manifest, dependency resolution, skill compatibility, version conflicts, build manifest, validate dependencies.

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

Skill manifest management for dotnet-agent-harness. Tracks skill dependencies, conflicts, version compatibility, and provides validation and resolution tools. Triggers on: skill manifest, dependency resolution, skill compatibility, version conflicts, build manifest, validate dependencies.

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

Design an agent's handling of obligations, prohibitions, permissions, and conflicts among norms and goals. Use when an autonomous agent must decide which norms apply and what to do when they conflict. NOT for simple fixed policy checks, ordinary BDI commitment design, or organizational metaphor.

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

OpenClawのGatewayや設定、認証情報の参照、チャネル、ポートの不具合を読み取り専用の確認で調べ、根拠付きの診断結果と次の対応を整理するスキル。

• Gatewayの起動失敗を調べたいとき
• 設定やチャネル認証のエラー確認
• ポートの競合や設定違いの確認

互いに依存しない不具合やテスト失敗を別々のエージェントに割り当て、並行して調査・修正するスキル。担当範囲を明確にし、結果の確認と変更の統合まで案内します。

• 原因の異なるテスト失敗を調べたいとき
• 別々の機能の不具合を修正したいとき
• 複数エージェントの担当を整理したいとき