Results for “conflict-resolution”

Expert guidance for Yjs, the high-performance CRDT (Conflict-free Replicated Data Type) framework for building collaborative applications. Helps developers implement real-time document editing, offline-first sync, and peer-to-peer collaboration with automatic conflict resolution.

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

Sync the branch with the latest `origin/main`, merge `origin/main`, resolve conflicts end-to-end, then commit and push the current branch.

Reconcile a processkit project’s migrations, health findings, and repository collaboration queue. Use when resolving all migrations, pk-doctor findings, GitHub issues, pull requests, or release blockers.

Resolves GitHub issues using isolated worktrees and test-driven development, then delegates PR creation to /github:create-pr so the quality gate and the /github:review-pr loop always run. This skill should be used when the user asks to "resolve an issue", "fix issue

Master orchestrator to resolve a PR by diagnosing state and delegating to specialized skills.

동시에 굴리던 여러 워크트리를 한 번에 통합합니다. 각 워크트리와 연결된 이슈를 확인하고 증거로 실제 해결 여부를 판정한 뒤, merge 를 시도하기 전에 충돌을 확정하고 계획한 순서대로 누적 검증해 순서 때문에 깨지는 경우까지 잡아냅니다. 충돌은 작업 브랜치 쪽에서 양쪽 의도를 보존하는 방향으로 해소해 승인받고, 비판 서브에이전트로 모호성을 걸러낸 다음 PR 을 merge 하고 통합 테스트로 재검증하고 이슈를 닫습니다. `$issue-merge`, "워크트리 전부 merge", "이슈들 통합", "PR 충돌 해결하고 합쳐줘" 요청과 issue-end 에서 merge 를 선택했을 때 사용합니다.

Suscita conflito de competencia ao tribunal (CPC 66 — positivo: dois juizes se declaram competentes; negativo: ambos incompetentes; ou controversia sobre reuniao/separacao), por parte, MP ou juiz (CPC 951), vedado a quem ja arguiu incompetencia relativa (CPC 952), por oficio ou peticao instruida (CPC 953), com designacao de juiz para medidas urgentes (CPC 955) e declaracao do juizo competente e dos atos validos (CPC 957). Use quando o operador disser conflito de competencia, dois juizes se dizem competentes, nenhum juizo aceita o processo, suscitar conflito, qual juizo e competente.

Harness Compound

当遇到令人情绪激动或陷入僵局的情境，需要跳出固有反应模式以做出更优决策时

Resolve cenci's neutral project configuration and shared guidance consistently.

Compare, cross-review, and merge competing plans from multiple agents into one executable direction with a clear handoff.

Load this skill when the user says "resolve comments", "resolve-comments", or "/resolve-comments". Checks open PR review comments, addresses valid ones in a single batched commit, and resolves all threads with appropriate replies.

Strategic patterns for solving intractable problems through cascading approximation, self-improvement, and heterogeneous evaluation from DeepMind's AlphaGo system

Convene a four-voice council for ambiguous decisions, tradeoffs, and go/no-go calls. Use when multiple valid paths exist and you need structured disagreement before choosing.

Convene a four-voice council of advisors to surface structured disagreement and tradeoffs for ambiguous decisions, go/no-go calls, and multi-path choices.

Convene a four-voice council for ambiguous decisions, tradeoffs, and go/no-go calls. Use when multiple valid paths exist and you need structured disagreement before choosing.

Redige a acao para desfazer contrato civil — distingue resolucao por inadimplemento (CC 474-475 — clausula resolutiva expressa opera de pleno direito, tacita exige interpelacao judicial; parte lesada pede resolucao + perdas e danos), resilicao por vontade (distrato 472, denuncia unilateral 473) e resolucao por onerosidade excessiva (CC 478-480). Inclui excecao de contrato nao cumprido (476-477). Use quando o operador disser rescindir contrato, resolver contrato, distrato, inadimplemento contratual, quebra de contrato, ou desfazer um contrato civil.

Manage Jira issues, boards, sprints, and projects via the jira-cli. Search, create, update, and transition issues directly from the command line.

Use the status-briefing skill to run `pk-reconcile session-start`, then

Give a decisive, project-grounded point of view in the subject's own shape: a graded verdict on an external-adoption question, a holistic take on a document, or a position on a user-supplied approach set. Use for a solo POV, a mid-session second opinion, a named-peer cross-check, any request to consult other models or reconcile their opinions, an `oracle` panel, or a correction-cost-gated proactive cross-check offer. Not for findings review (use ce-doc-review), neutral explainers, or generating options (use ce-ideate or ce-brainstorm).

当用户明确要求“解决当前 merge / rebase / cherry-pick 冲突、提交代码、创建 commit、把改动分批提交并 push、推送当前分支”时使用。进行中的冲突要先识别 Git 操作和双方原始意图，逐 hunk 做语义合并并运行项目检查，再经用户确认继续操作；普通改动要检查敏感信息与异常差异，拆成可运行、可审查、可回滚的原子提交后确认提交和推送。不得自动发起或中止 merge / rebase / cherry-pick，不得强推或随意改写已发布历史。不要用于普通改动尚未完成或验证失败、只想查看 Git 状态，或要创建 PR 的场景。

Diagnoses and fixes build, type, and runtime errors with minimal changes, covering TypeScript, PyTorch, and other build systems.

Keep a PR merge-ready by triaging comments, resolving clear conflicts, and fixing CI in a loop.

Keep a PR merge-ready by triaging comments, resolving clear conflicts, and fixing CI in a loop.

Convene a four-voice council for ambiguous decisions, tradeoffs, and go/no-go calls. Use when multiple valid paths exist and you need structured disagreement before choosing.

当需要在2-3个月内集中精力攻克一个重大、有挑战性的个人或职业目标时，使用此模型

Mitigate a production incident or urgent regression first, then route to root-cause remediation and a postmortem.

当需要在写作中与读者建立情感连接、放大问题严重性，并引出后续解决方案时

Reconcile canonical declarative documents under docs/ with verified implementation discoveries after a FULLY_IMPLEMENTED moonspec-verify verdict. Use when an orchestration run must decide whether verified discoveries show the owning canonical document is impossible, unclear, or inconsistent, apply the smallest correct doc update, or escalate ambiguous authority conflicts and deliberate divergences instead of editing.

Implements offline-first architecture in Flutter apps with local caching, bidirectional sync, connectivity detection, and conflict resolution.

Designs intuitive gesture-based interactions for touch and pointer devices, covering core gestures, discoverability, feedback, thresholds, conflict resolution, and accessibility.

Migrate .NET projects from per-project package versioning to NuGet Central Package Management (CPM) using Directory.Packages.props, with baseline build capture, version conflict resolution, and post-conversion validation.