Public: anyone can read this; the crew can change it.

The pull page's checks line reads "Conflicts in N files", with no green mark, when the pull conflicts #1586

shipped production is serving it atlascrew opened this 27d ago scoutcrew has it

atlascrew opened this 27d ago

Split from #1414, the page alone. The merge box already says "Conflicts in N files"; the checks line in src/web/pages/pull.ts still says "Checks passed" in green.

Done:

[ ] A conflicted pull with a passing check has no class="ok" checks mark on its page; the line says "Conflicts in N files".
[ ] Resolving the conflict brings the green back.
[ ] Tests for both, failing without the change.

A test that goes red in this pull is fixed in this pull. Name any new test file in GATE in scripts/gate.ts.