「conflict」の検索結果

Resolve an in-progress git merge or rebase conflict end to end: read the conflict state, recover each side's original intent, resolve every hunk, run the project's checks, and prepare the merge/rebase for an explicitly approved finish. Use when asked to "resolve merge conflicts", "fix this rebase", "finish the merge", or when `git status` shows conflicted (unmerged) paths. NOT for the full ship pipeline that merges the base branch first (see mk:ship); NOT for debugging a runtime bug or test failure unrelated to a conflict (see mk:investigate / mk:fix).

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

Resolve merge and rebase conflicts with safe recovery strategies. Covers identifying conflict sources, reading conflict markers, choosing resolution strategies, and continuing or aborting operations safely. Use when a git merge, rebase, cherry-pick, or stash pop reports conflicts, when a git pull results in conflicting changes, or when you need to safely abort and restart a failed merge or rebase operation.

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

[omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push only with `--force-with-lease`. Use when the user says: git-workflow, git workflow, merge conflict, merge conflicts, rebase conflict, resolve the conflict, resolve this conflict, conflict markers.

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

Conflict resolution strategies and mediation techniques for interpersonal and group communication. Covers conflict styles (Thomas-Kilmann model), interest-based negotiation (Fisher and Ury), de-escalation techniques, mediation process, restorative practices, workplace conflict, and cross-cultural conflict norms. Use when mediating disputes, analyzing conflict dynamics, preparing for difficult conversations, or building conflict-competent communication cultures.

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

2つのエージェントが別々に加えた変更のGit競合を、双方の差分と意図から中立的に解決。競合箇所ごとの判断理由を記録し、ビルドやテストで統合結果を確認します。

• 2つのエージェントのブランチ競合を解消
• 並行したworktreeの変更を統合
• 競合する設計判断の理由を確認したいとき

Character creation, protagonist/antagonist design and dramatic conflict for scripts (人物/对手/冲突) — merged from Lajos Egri (three-dimensional character, orchestration, unity of opposites, pivotal character, rising vs static vs jumping conflict, transition), William Indick's Psychology for Screenwriters (Freud, Erikson, Jung archetypes, Campbell/Murdock hero journeys, Adler, Rollo May), Robert McKee (characterization vs true character, dimensions, gap, antagonism principle), Neill Hicks (character invocation, self-concept, cognitive dissonance, five conflict focuses, Maslow), Lisa Cron (desire vs misbelief), and Lu Jun (人物要活八要, 对手要强, 给对手一把刀, 最强的对手是自己, 不许请祥云). Use when building a protagonist, an antagonist or a cast, when a character feels flat or acts out of character, when conflict stalls or jumps, when a villain is too weak, when designing an arc or motive, or when diagnosing melodrama.

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

Identifies and analyzes conflicts in software requirements including logical contradictions, technical incompatibilities, resource constraints, timeline issues, data conflicts, and stakeholder priority mismatches. Use when reviewing requirement sets, specifications, user stories, or project plans to detect conflicts that could block implementation or cause rework. Provides detailed conflict analysis with resolution strategies and impact assessment.

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

Mechanism conflict detection and coordination for AI assistant systems. Automatically detects crontab conflicts, systemd service conflicts, script overlaps, and log path inconsistencies. Use for maintaining system harmony and preventing internal conflicts.

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

チームの開発に合うGitのブランチ運用を選び、コミットやプルリクエストの書き方、履歴の整理、変更の衝突解消、リリース管理まで手順を整えるスキル。

• 新規プロジェクトのブランチ運用選定
• コミット文とPR説明の統一
• PR前にローカルの履歴を整理したいとき

Guides managing conflicting privacy requirements across jurisdictions. Covers data localisation vs transfer freedom, consent standards variation, age thresholds, breach timelines, and resolution frameworks for incompatible obligations. Keywords: conflicting laws, data localisation, consent variation, age thresholds, resolution framework.

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

Use when parallel agents in a convoy or across git worktrees hit a write conflict on shared state — a git tree, a config, or a shared document — and you must decide whether the conflict is semantically real. Classifies each conflicting hunk as independent (keep both), redundant (pick one), or a genuine clash (escalate), instead of blind locks, abort-and-retry, or escalate-everything. Sits ABOVE refinery-merge and NEVER blind auto-merges: it wraps an LLM judgment, defaults to escalate on any uncertainty, and unconditionally escalates any hunk touching .planning/, config, credentials, or safety-critical paths. Backed by CoAgent (arxiv 2606.15376v1). Triggers on write conflicts between parallel agents on shared repo state.

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

Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts. Not for people-mediation conflicts: use culture-conflict-mediation.

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

Use when the user has merge conflicts or says "resolve conflicts". Understands conflict markers, resolution strategies, and verification workflow.

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

既存コードから暗黙の命名・構成・エラー処理の慣習を読み取り、AIが参照するルールにまとめるスキル。方針の食い違いを一つずつ確認し、変更後のルール更新も支援します。

• 古いコードベースにAIを導入したいとき
• 暗黙のコーディング規約を文書化
• 命名や構成の方針の食い違いを整理

Retrieve geolocated armed-conflict events (UCDP) with parties, fatality estimates, and violence type, filterable by country and date range. Use when the user asks about recent fighting, attacks, or conflict activity in a country or region.

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

Workflow for upgrading/integrating cache-dit in SGLang diffusion (multimodal_gen): DBCache, DMD calibrator, TaylorSeer, SVDQuant DQ; porting upstream PRs and resolving conflicts against the per-request knob system; adding new cache knobs; building the sglang generate CLI test matrix; precision validation (PSNR / log evidence); troubleshooting environment issues (wheel ABI, svdq extension, flashinfer conflicts). Use when upgrading or integrating cache-dit in sglang diffusion, porting cache-dit PRs with conflicts, adding cache knobs, running the sglang generate CLI test matrix, or validating precision (PSNR) for DBCache/DMD/SVDQuant(DQ) paths.

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

Takes a proofread or apsa-style report file (or any markdown file using **Original:** / **Recommended:** syntax) and rewrites the original source file with git merge conflict markers so the user can accept or reject each suggested edit using VS Code or Positron's built-in merge conflict UI. Branch names are "original" and "claude-edits". Use when asked to apply edits, insert conflict markers, or set up merge resolution for a copy-edit report. Supports an optional @sec-label argument to restrict markers to one section.

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

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

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

Use when auditing conflicts in a Bethesda plugin set — determining for a record (or a plugin's records) which override wins, what the conflict label is, what references it, and whether the configuration is safe or breaking.

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

Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.

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

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

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

Git is deceptively simple to learn and incredibly hard to master. The difference between a team that ships and a team that fights merge conflicts all day comes down to workflow discipline. Your git history is documentation - make it tell a story future you can understand. This skill covers branching strategies (trunk-based, gitflow, GitHub flow), commit hygiene, merge vs rebase, conflict resolution, and the commands you actually need. Key insight: most git disasters come from not understanding what you're about to do. 2025 lesson: Trunk-based development with short-lived branches has won. Long-lived feature branches are a code smell. If a branch lives more than a few days, something is wrong with your architecture or process. Use when "git workflow, branching strategy, git merge, git rebase, merge conflict, git commit, trunk-based, gitflow, git history, git revert, git reset, git, version-control, workflow, branching, commits, merge, rebase, collaboration" mentioned.

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

Stop everything and surface a rule conflict — persona vs. docs vs. code. Present both sides and the conflict-hierarchy level; the user resolves. No silent reconciliation.

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

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

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