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

Abierto
  • ¿Algo no está bien?
#600 0 comentarios 0 reacciones 0 asignados Ver en GitHub

Los mantenedores suelen responder en 1 día

Nadie ha tomado este issue todavía.

Evaluación

Dificultad
4/5
Tiempo estimado
3-5 días
Aptitud para principiantes
38/100
Tipo de issue
Nueva funcionalidad
Claridad
Bastante claro
Estado de actividad
Activo
Área
tooling

Línea de trabajo

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.

Escrito por el modelo de indexación a partir del texto del issue.

Descripción

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.
Lenguaje dominante
HTML
Estrellas
1
Forks
0
Merge medio
49 min
PR fusionados (30 d)
20

Preparar el entorno

Primeros pasos

  1. Lee el issue completo y luego la guía de contribución del proyecto.
  2. Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
  3. Haz un fork del repositorio y trabaja en una rama.
  4. Abre un pull request que haga referencia al número del issue.

Más de unic/unic-agents-plugins

Todos los issues de unic/unic-agents-plugins

Issues similares

Más issues de DevTools

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.