Results for “conflict-resolution”

Git workflow patterns including branching strategies, commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes.

Git workflow patterns including branching strategies, commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes.

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

Defines the architecture and orchestration primitives for multi-agent teams, covering role allocation, conflict resolution, reward routing, and the operational lifecycle of agent collectives.

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

Guides users through Nonviolent Communication to turn emotionally charged thoughts into constructive messages, structuring responses with observation, feeling, need, and request.

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.

Provides a structured methodology for solving nontrivial, ambiguous problems by framing outcomes, selecting evidence, routing specialists, choosing options, and verifying results.

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.

Use to audit how payment disputes, chargebacks and unrecognised-transaction claims are handled against scheme deadlines and evidence standards. Trigger for "audit our dispute handling", "chargeback quality review", "are we meeting scheme deadlines", unrecognised transaction claims, provisional credit decisions, or a customer complaining their dispute was rejected unfairly.

동시에 굴리던 여러 워크트리를 한 번에 통합합니다. 각 워크트리와 연결된 이슈를 확인하고 증거로 실제 해결 여부를 판정한 뒤, 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

Use with analysis-agent or task-agent for task-local transaction, isolation, and conflict decisions. Do not use without a transaction decision or as task owner.

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

Process the Refinery merge queue - collect agent work, detect and resolve conflicts, merge in dependency order, and verify integration.

Provides structured techniques for breaking through stuck points in problem-solving, including collision-zone thinking, inversion, pattern recognition, and simplification.

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

Provides creative problem-solving techniques for breaking through stuck points, including collision-zone thinking, inversion, pattern recognition, and simplification.

Resolves, generates, and operates on media assets (audio, images, icons, logos, voice, color grades, LUTs) for HyperFrames projects, using a local cache and the HeyGen CLI for free-usage catalog search and TTS.

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

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

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.

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

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.