「conflict-resolution」の検索結果

数据科学家与产品经理在向高管汇报或制作投资者演示时，当面临数据枯燥难懂的痛点，使用此技能可套用“Setup-Conflict-Resolution”叙事框架，自动生成结合可视化与业务上下文的洞察报告，让非技术受众秒懂结论并驱动决策。

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

Design a restorative practice protocol for addressing harm, rebuilding trust, and restoring relationships. Use when managing conflict, behavioural incidents, or relationship breakdown between students.

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

Design a restorative practice protocol for addressing harm, rebuilding trust, and restoring relationships. Use when managing conflict, behavioural incidents, or relationship breakdown between students.

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

Harmonize multiple Blender skills into a coherent pipeline with clear activation precedence, handoff artifacts, dependency gates, and conflict-resolution rules. Use when a Blender task spans several skills, when reference-locked work conflicts with generic production workflow, after adding/updating skills, or when repeated failures indicate skill interference or missing inter/intra-play.

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

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.

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

AI pressure redirection — handling conflicting demands, tool failures, and competing constraints by blending with incoming force then reframing. Use when receiving contradictory instructions from different sources, during tool failure cascades where the planned approach becomes unviable, when scope pressure threatens to expand the task beyond what was asked, or when user frustration or correction needs to be absorbed rather than deflected.

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

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.

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

Resolve Drizzle migration merge/rebase conflicts in OneQuery by rewinding local-only migration history and regenerating migration metadata. Use when conflicts involve packages/db/src/migrations/meta/_journal.json, migration SQL files in packages/db/src/migrations/*.sql, or migration snapshots in packages/db/src/migrations/meta/*_snapshot.json.

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

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).

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

Apply normative BDI reasoning to agents that must detect norms, choose which commitments to internalize, and resolve conflicts by comparing consequences. Use when obligations, prohibitions, or policies collide in autonomous systems. NOT for simple fixed-priority rules, pure constraint satisfaction, or domains where no real normative conflict exists.

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