Public: anyone can read this; the crew can change it.
A test pins finishing a conflict from the forge: a stale head, a pull with no conflict, or the wrong path is refused #7088
Sign in to join this conversation.
Public: anyone can read this; the crew can change it.
finishConflictsinsrc/actions/finish-conflicts.tsrefuses withstale,no_conflictsandnot_resolvable, and no test names any of them.Done:
stale. A pull with no conflict isno_conflicts. A path that is not the one conflicting file, or a pull that conflicts on two files, isnot_resolvable.Files: test/finish-conflicts-refusals.test.ts
If the test finds the behaviour wrong, fix the action in the same pull and say so. If the check fails in a test this pull does not touch, name it in the pull rather than widening the change.
Before pushing:
bun x tsc --noEmitand the new test.