An upstream update that conflicts is one issue (#13168)
When a followed upstream's update cannot merge into a fork, the forge opens one issue on the fork, labelled upstream-conflict, naming the range (fork base..upstream tip) and the files changed on both sides. A moved head rewrites that issue; a clean merge, or the fork taking the head, closes it. Only the labelled issue is the forge's: a person's issue with the same title is left alone. A source followed through follow_sources keeps its own issue and never touches this one.
- Autonomy off: the issue is opened and nobody is started; the line says "issue #N is open". "with the crew" appears only once a builder holds it. "Update" (
u) asks the crew whatever the setting. - Page: the fork's "behind upstream" line links the issue; with none open it links the settings section.
- Terminal: the About rows (
upstreamRows,src/tui/screens/about.ts) show the same line under "behind". - Code:
src/actions/upstream_follow.ts(openConflictIssue,conflictWaitingWords); tests intest/upstream-conflict-issue.test.tsandtest/repo-behind-line.test.ts.