afk-loop: resolve merge conflicts with /resolving-merge-conflicts

オープン
  • 何か問題がありますか？
#600 コメント 0 件 リアクション 0 件 担当者 0 名 GitHub で見る

メンテナーはふだん 1 日以内に返信

まだ誰も着手していません。

評価

難易度
4/5
見積もり時間
3〜5日
初心者へのやさしさ
38/100
issue の種類
機能追加
明瞭さ
おおむね明確
活発さ
活発
領域
tooling

調査の方向性

Start with .claude/skills/afk-loop/SKILL.md and the vendored /resolving-merge-conflicts skill, then review the merge gate language and issue #599's refused-hook case. Trace every conflict-resolution prompt and the existing stop conditions. Done means the documented rules cover ownership, maintainer handoffs, review and re-measurement, hook refusal, and precedence without leaving the listed open questions unresolved.

索引モデルが issue の本文から書いたものです。

説明

feature needs-triage repo

Problem

afk-loop has no procedure for a merge conflict. .claude/skills/afk-loop/SKILL.md stops the run on "a merge conflict that is not a mechanical rebase", and the merge gate accepts a commit after step 8 when it is "a mechanical rebase" that the orchestrator re-measured. Neither place says what a mechanical rebase is, how to make one, or who makes it.

Conflicts are expected. Each worker branches from origin/develop, so two PRs of the same run can touch the same file, and § One ticket already records a PR from outside the run because "whichever PR merges second takes the conflict". Today every such conflict ends the run or waits for the maintainer.

The repository vendors /resolving-merge-conflicts from mattpocock/skills. It reads the history and the primary sources of each hunk, keeps both intents where it can, and runs the project's checks. It was used on PR #257 on 2026-09-27, where it resolved three conflicts in root files and passed pnpm check and pnpm test. The NDA pre-commit hook then refused the merge commit, see #599.

Acceptance criteria

  1. afk-loop says when a conflict is resolved with /resolving-merge-conflicts, and who runs it: the orchestrator, the worker of that ticket, or a new subagent.
  2. afk-loop says which conflicts it still hands to the maintainer, in words a run can apply without judgement. "Mechanical rebase" is either defined there or no longer used.
  3. The merge gate says how a conflict-resolution commit is reviewed before the merge. A resolution commit that no review round read and that nobody re-measured does not pass the gate.
  4. afk-loop says what happens when a guard refuses the resolution commit, as in #599. The run keeps the hooks enabled, and the existing stop condition for a refused commit still applies.
  5. The skill's own rule "Always resolve; never --abort" does not override a stop condition of afk-loop. afk-loop states which one wins.
  6. Every prompt that resolves a conflict carries these rules inline, because a worker or reviewer does not read SKILL.md.

Open questions

  • Merge develop into the branch, or rebase the branch onto it. A rebase rewrites commits that a review round already read and needs a force push, which the maintainer's rules make an ask-first step.
  • Whether a PR from outside the run, such as #257, is ever in scope, or only the run's own PRs.
  • Whether this belongs in the current skill now, or waits for the plugin spec of #594.
主要言語
HTML
スター
1
フォーク
0
平均マージ
49分
マージ済み PR（30日）
20

環境構築

はじめの一歩

  1. issue を最後まで読み、次にプロジェクトのコントリビューションガイドを読みます。
  2. 着手することを issue にコメントします — 二人が同じ作業をするのを防げます。
  3. リポジトリをフォークし、ブランチを切って変更します。
  4. issue 番号を参照したプルリクエストを送ります。

unic/unic-agents-plugins のほかの issue

unic/unic-agents-plugins の issue をすべて見る

似ている issue

DevTools の issue をもっと見る

新しい issue をメールで受け取る

初心者向けの GitHub issue を短くまとめたダイジェスト。