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

A pull's re-check and conflict sentences live in one module, read by the pull page, conflicts and the terminal #5620

shipped production is serving it opened this has it
opened this

For: Asking for a check or a conflict resolution reads the same wherever it is said, on the web and in the terminal, because it is said from one place. Today each sentence below is typed out separately in src/web/pages/pull.ts, src/web/pages/conflicts.ts, src/tui/screens/stalled.ts, src/tui/screens/pull.ts.

Done:

  • [ ] src/actions/pull_ask_words.ts exports these sentences (new, or the module that already owns that concept; say which in the pull):

- "Check asked for at the current head." - "Asked: the crew is resolving it on the pull's own branch."

  • [ ] Every file named imports them, and grep -rn for each sentence under src/ finds only the module.
  • [ ] Pages, screens and answers are byte-for-byte unchanged: every existing test passes as it is.
  • [ ] A new test/pull-ask-words.test.ts asserts each file named no longer contains the literal (read as text), and fails if a copy is typed back.
  • [ ] Before pushing, run test/pull-ask-words.test.ts, the tests of the files you touched, bun x tsc --noEmit and, if src/web changed, bun scripts/design-lint.ts. A red test elsewhere that main also has is named in the pull, not a reason to stop.

Files: src/actions/pull_ask_words.ts, src/web/pages/pull.ts, src/web/pages/conflicts.ts, src/tui/screens/stalled.ts, src/tui/screens/pull.ts, test/pull-ask-words.test.ts. Risk: a pure move; change no wording, and touch only the lines the sentences are on.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs