Make a way to resolve merge conflicts - a command focused on that - if already handled though, then focus on daemon or loop part which can check repo's PR's for conflicts and resolve them #41

Activity

1. JacobStephens2 commented on Oct 17, 2026

   

   JacobStephens2

   on Oct 17, 2026

   OwnerAuthor

   More actions

   This was generated by AI during triage.

   Triage Notes

   Conflict Repair already handles a Run's conflicts, and running its Issue URL again continues preserved work. The remaining request is a Pass that finds existing pull requests needing repair; current Pickup runs do not do that.

   Next decision: should the sweep act only on factory-owned PRs, or also on arbitrary PRs, and does it merely report conflicts or start Repairs? A scheduled form should remain a one-shot Pass under ADR 0009. Coordinate with #706's existing-PR review Command and #617's deliberate hand-back policy; neither covers the full sweep.
2. JacobStephens2

   added

   enhancementNew feature or requestNew feature or request

   needs-triageMaintainer needs to evaluate this issueMaintainer needs to evaluate this issue

   on Oct 17, 2026
3. JacobStephens2

   added

   wontfixThis will not be worked onThis will not be worked on

   and removed

   needs-triageMaintainer needs to evaluate this issueMaintainer needs to evaluate this issue

   on Nov 9, 2026
4. JacobStephens2 commented on Nov 9, 2026

   

   JacobStephens2

   on Nov 9, 2026

   OwnerAuthor

   More actions

   This was generated by AI during triage.

   Closing as already implemented: thirdshift fix [<PR URL or number>] (src/fix.rs, docs/guide.md#fix-runs, shipped in #1804 / #1799 / #1805) resolves merge conflicts and red CI on existing pull requests both on demand and as an unattended Pass.
5. JacobStephens2

   closed this as completedon Nov 9, 2026