「conflicts」の検索結果

Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams.

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

Pressure-test an existing plan or design artifact until it is coherent enough for the next workflow step or plainly blocked. Use when the user wants to be grilled on a plan, design doc, PRD, ADR, rollout plan, migration runbook, rolling-wave project shape, or slice contract; when they say "grill me"; or when Codex should interrogate a source-of-truth artifact, inspect code and adjacent docs before asking, auto-answer evidence-backed questions, ask only about conflicts or low-confidence recommendations, edit the original file in place, preserve the artifact's existing format, and keep conclusions, blockers, readiness, and deferred work synchronized in the document.

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

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

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

Rebases a feature branch onto its latest base, resolving conflicts while preserving the intent of local changes, optionally force-pushing and watching CI afterward. TRIGGER when: the user wants to rebase a feature branch, update a branch against its base, or replay local work on top of the latest upstream. DO NOT TRIGGER when: merging a release branch into dev → merging-branches; only watching CI on an already-open PR → monitoring-pull-requests.

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

Build React animations with Motion (Framer Motion) - gestures (drag, hover, tap), scroll effects, spring physics, layout animations, SVG. Bundle: 2.3 KB (mini) to 34 KB (full). Use when: drag-and-drop, scroll animations, modals, carousels, parallax. Troubleshoot: AnimatePresence exit, list performance, Tailwind conflicts, Next.js "use client".

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

Use to consolidate multiple already-run judge verdicts into one report — consensus, conflicts, must-fix/should-fix with per-judge provenance. Consume-only, no opaque score, never auto-gates.

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

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

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

Audits Convex performance for reads, subscriptions, write contention, and function limits. Use for slow features, insights findings, OCC conflicts, or read amplification.

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

Audits Convex performance for reads, subscriptions, write contention, and function limits. Use for slow features, insights findings, OCC conflicts, or read amplification.

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

Pull remote changes and reconcile with local work, checking for soft conflicts

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

Rebase onto latest upstream, checking for soft conflicts

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

Package license analysis — detect copyleft conflicts against a permissive policy, surface AGPL / SSPL / GPL contaminants, output SPDX SBOM with per-package license findings. Use when auditing a release for license compliance, vetting a new dependency's license, building an OSS-attribution document, or producing a customer-facing license disclosure.

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

Record the statements a journal requires and a reader checks — authors with their CRediT contributions, ethics approval that names the body and the reference number, how consent was taken, funding with grant numbers, conflicts of interest, data availability with an address or a reason, and the use of generative AI — as a validated record that the submission folder prints and the manuscript never carries. Use when a run is heading for submission, when an author asks who should be listed, when consent, approval or data sharing has to be stated, or when the venue's AI policy comes up.

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

Advisory checkpoint for deciding whether planning-document edits should be split into a separate planning branch/PR. Use only when the user explicitly asks where to commit `memory/SPEC.md` or `memory/PLAN.md` changes, mentions planning-doc merge conflicts, asks for a planning PR, or instructs you to prepare/submit one. Do not trigger for ordinary ln-* planning edits, one-line status updates, or routine canonical reconciliation.

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

Provider-neutral planner for synchronizing MCP configuration, skills and rule files across agent providers and app classes. It discovers evidenced local options and lets the user choose truth, targets, direction and conflicts.

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

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.

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

Turns a set of questions (form exports, helpdesk logs, meeting Q and A, chat threads, a plain list) plus the source documents the user supplies into a DRAFT FAQ grouped by theme: every answer quoted or paraphrased from a named source with a reference, verbatim quotes for dates, figures, eligibility and obligations, UNKNOWN where the sources are silent, a source register with precedence, a conflicts table and a routing list of unanswered questions to owners. Use when the user asks to "build an FAQ from these documents", "answer these questions from the policy", "turn the Q and A into an FAQ page", "group these questions and answer them from the guide" or "what do our documents say about these questions". Do not use for the manager FAQ of a changed HR policy, use policy-change-briefing instead; for checking whether a document's own claims are evidenced, use claims-evidence-map. Drafts for human review; never approves, authorises or signs off.

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

Runs twice in a PFD to P&ID job. Part 1, before gate G3, validates the discipline proposals for provenance, UNKNOWN handling, conflicts, prohibited content and cross-section consistency and returns results and blocking items. Part 2, before gate G5, assembles the review package, with job header, gate record, every register and proposal, consolidated UNKNOWN list, feedback log and closing statement. Use when the user asks to "validate the enrichment", "run validation before G3", "assemble the review package" or "build the G5 package". Do not use for the readiness map, use pid-tool-readiness-mapping instead; do not use to produce a missing discipline section, use the discipline skill that owns it. Drafts for human review; never approves, authorises or signs off.

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

Builds a role-tuned morning brief as a dated Markdown document covering emails that need replies, today's calendar with conflicts flagged, chat mentions and upcoming deadlines, in the section order set by a preset (project manager, executive assistant, IT admin, sales or custom) read from an editable config. Use when the user asks to "run my brief", "give me my morning brief", "start-of-day summary", "switch my brief to the sales preset" or "change what my brief covers". Do not use for tracking promises made or owed across days, use commitment-catcher instead. Drafts for human review; never approves, authorises or signs off.

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

Prevent tool call conflicts when making concurrent edits across a codebase. Establishes strict file ownership, interface contracts, and merge strategies. Use with parallel-agents when executing concurrent code changes.

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

Build React animations with Motion (Framer Motion) - gestures (drag, hover, tap), scroll effects, spring physics, layout animations, SVG. Bundle: 2.3 KB (mini) to 34 KB (full). Use when: drag-and-drop, scroll animations, modals, carousels, parallax. Troubleshoot: AnimatePresence exit, list performance, Tailwind conflicts, Next.js "use client".

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