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
| id | iss-2610120138148399 |
|---|---|
| type | issue |
| lifecycle | open |
| severity | minor |
.abcd/work/issues/open/iss-2610120138148399-the-implement-loop-s-conflict-probe.md
open on GitHub ↗ · commit history ↗