Public: anyone can read this; the crew can change it.
Re-cut a conflict in a split file mechanically instead of a full agent run (#6140, part 3) #6155
commented
Live triage (automatic, not written by a person): no pillar named, so it waits behind the Later gate; name a pillar to move it.
Sign in to join this conversation.
Split off from #6140, which landed the other three parts (rebases first in the check lane, idle builders take a busy builder's rebases,
conflicted N, rebasing M, room Ron the tick line and /flow).What: when a pull's only conflicts are in a file that main split into per-entry files (like
src/http/mcp.ts→src/http/mcp/tools/*, #5932), bring it up to date with a script, not aconflictagent run: take the pull's added or changed entry from the old file, write it to its per-entry file, regenerate the index, commit, push, and let the check run.Done when:
src/crew/finishing.ts) and the conflict sweep (sweepConflictsinsrc/crew/autonomy.ts) recognise a conflict confined to a split file (the base deleted the file the pull changed, and the per-entry directory exists on the base) and try the re-cut before queuing an agent run.src/checks/finishing_first.ts), and the run or log line records that it was mechanical.