Results for “merge-conflict”

Guides Git version control practices: branching strategies, commit conventions, merge vs rebase, conflict resolution, and pull request workflows for collaborative teams.

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

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

Composite skill — take a PR from "I think it's ready" to merged with full gate verification. Chains pr-merge-readiness (verdict) → ci-watch / gh-fix-ci (if blockers) → gh-address-comments (if review needed) → ship (when verdict is MERGE). Use as the one-call answer to "can I merge this?" instead of running 4 skills sequentially.

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.

Detects MSBuild projects with conflicting OutputPath or IntermediateOutputPath to diagnose build failures.

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

Merges mature lessons from a domain memory file into its instruction file, preserving knowledge with minimal redundancy.

Integrate an exact reviewed PR under repository policy, choose truthful history semantics, and verify cleanup

Use when merging a single GitHub pull request. Handles pre-flight checks, waits for CI, and executes the merge with the repo's default method or merge queue.

Safely upsert, inspect, review, or explicitly merge the pull request for an issue-backed work branch

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.

Sync main, rebase active worktrees, and clean up merged branches safely.

Provides Git commands and workflows for commits, branches, rebases, merges, conflict resolution, history recovery, and team collaboration, with safety rules for force-pushing and destructive operations.

Use when two or more agents produce conflicting outputs, recommendations, or decisions. This skill provides a structured process for resolving disagreements between agents, ensuring conflicts are resolved fairly with clear reasoning and documented decisions.

Facilitates a read-only standup across git worktrees, branches, or PRs to compare changes and produce one consolidation plan.

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

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.

PR Fleet

Use when a finished, reviewed branch is committed and needs to be merged into the default branch in a repo that integrates directly to `main` (not via pull request).

DEPRECATED — merged into monday-for-agents. See skills/monday-for-agents/SKILL.md.

Review technical and strategy documents for codebase drift, strategic alignment, cross-document conflicts, simplification opportunities, engineering quality, and document organization. Use when auditing whether docs should be kept, updated, merged, split, moved, archived, or deleted.