「conflict」の検索結果

Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update, and resolve conflicts safely.

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

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

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

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.

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

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

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

Slow down interpretation from observation to action. Use when students or adults need to examine assumptions in conflict, dialogue, or inquiry.

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

Merge a Git source branch, including its still uncommitted changes, into a target branch through a regular merge, a rebase with fast-forward, or a squash merge, resolving merge conflicts semantically, check that the source branch landed, and emit a MERGED, CONFLICT, or FAILED verdict. Use when the user calls to "merge", "integrate", or "land" a branch.

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

Guide for performing Node.js version upgrades in the Electron project. Use when working on the roller/node/main branch to fix patch conflicts during `e sync --3`. Covers the patch application workflow, conflict resolution, analyzing upstream Node.js changes, building, running the Node.js test suite, and proper commit formatting for patch fixes.

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

Guide for performing Chromium version upgrades in the Electron project. Use when working on the roller/chromium/main branch to fix patch conflicts during `e sync --3`. Covers the patch application workflow, conflict resolution, analyzing upstream Chromium changes, and proper commit formatting for patch fixes.

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

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.

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

Git version control best practices: branching, commits, merging, conflict resolution, PR workflows. Use when managing branches, creating commits, merging code, or resolving conflicts.

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

Structures IAC/LPAC design with composition, authority scope, conflict review protocols, and valuation oversight. Use when designing advisory committees, defining LPAC authority, or structuring conflict resolution processes.

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

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.

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

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

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

Pull the latest remote base branch into the current local branch and resolve merge conflicts (aka update-branch). Use when the agent needs to sync a feature branch with origin, perform a merge-based update (not rebase), and guide conflict resolution best practices.

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

Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update (not rebase), and guide conflict resolution best practices.

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

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

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

Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update (not rebase), and guide conflict resolution best practices.

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

Review what Prisma Next migrations will run on merge or deploy, render the migration graph, resolve concurrent / diamond-convergence conflicts, and configure environment refs for CI. Use for "what migrations are going to run", "what runs on deploy", merge conflict, diamond convergence, concurrent migrations, migration status, ref management, staging, production, MIGRATION.DIVERGED, MIGRATION.NO_MARKER, MIGRATION.MARKER_NOT_IN_HISTORY, prisma migrate status, prisma migrate diff, prisma migrate resolve.

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

Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update (not rebase), and guide conflict resolution best practices.

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

Continuously monitor a GitHub PR for merge conflicts, CI failures, and CodeRabbit review comments, then automatically fix any issues found. Polls every 5 minutes and loops until every check is green. Use this skill whenever a PR has just been created or code has been pushed to a PR branch — it should be the default follow-up action after any PR creation or push. Also trigger on: "watch this PR", "guard this PR", "monitor CI", "keep fixing until green", "PRを監視して", "CIが通るまで 直して", /pr-guardian. When a PostToolUse hook reports that a push or PR creation just happened, proactively invoke this skill to start monitoring without waiting for the user to ask.

Coordinates release preparation for your monorepo — maintaining CHANGELOG and the release assessment document, resolving merge conflicts on release branches, and communicating status, risk, and asks to the broader team. Use when the user mentions release manager, release train, cut a release, release branch, CHANGELOG, release assessment, monorepo release, merge conflicts during release, versioning, or coordinating a version bump with engineering and stakeholders.

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

Structured approach to workplace conflicts, performance discussions, and challenging feedback using preparation-delivery-followup framework. Use when preparing for tough conversations, addressing conflicts, giving critical feedback, or navigating sensitive workplace discussions.

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

Drafts U.S. litigation attorney representation agreements for client onboarding, covering scope, fees, retainers, confidentiality, conflicts, duties, withdrawal, and dispute resolution. Use when converting consultations into enforceable engagement terms for civil litigation matters including personal injury. Trigger: engagement letter, litigation retainer, representation agreement, fee contract, conflict disclosure, attorney withdrawal, client acknowledgment.

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

Manages end-to-end workflow for multi-organization amicus coalition briefs in appellate courts. Covers single-pen drafting governance, position alignment, conflict resolution, documented sign-offs, FRAP 29/Rule 37.6 disclosures, FRAP 26.1 corporate disclosures, cover formatting for multiple amici, and compliant filing. Use when coordinating coalition amicus briefs, managing sign-offs, drafting joint friend-of-court briefs, handling multi-amici filing, or resolving inter-organization conflicts. Triggers on phrases like "coalition brief," "12 orgs joining this amicus," or "coordinate the amicus."

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