This is the record of an abcd-managed repository

abcdBetav0.16.2 · 2026-11-06

Development record

The implement loop's conflict probe (internal/core/implement/loop/conflict.go, conflictRefusal) predicts the forge's merge from the head the loop pushed, ld.Pushed, not the branch's current tip. The refusal's remedy is a person's hand merge, pushed to the lane's branch; that push does not change ld.Pushed. So if the pull request is still reported CONFLICTING afterwards (a second conflict, or the forge not yet recomputed), the probe re-merges the old head and can name a path the person has already resolved, sending them to fix what is fixed.

issueopenminoriss-2610120138148399

The implement loop's conflict probe (internal/core/implement/loop/conflict.go, conflictRefusal) predicts the forge's merge from the head the loop pushed, ld.Pushed, not the branch's current tip. The refusal's remedy is a person's hand merge, pushed to the lane's branch; that push does not change ld.Pushed. So if the pull request is still reported CONFLICTING afterwards (a second conflict, or the forge not yet recomputed), the probe re-merges the old head and can name a path the person has already resolved, sending them to fix what is fixed.

Frontmatter

idiss-2610120138148399
typeissue
lifecycleopen
severityminor