Taking updates from an origin you follow
A repository that follows an upstream address (a connected origin, a migration, a pasted link; repo_upstream) takes its updates the way a fork takes its parent's. The doors ask for a parent in this forge first and come to src/actions/upstream_sync.ts when there is none.
- Take fast-forwards when the repository has nothing the upstream lacks, returns to the upstream's commit ids when its own work already landed there under other ids, merges when git can, and otherwise refuses with the files in conflict.
- Converge hands those conflicting files to the crew on a converge issue, with the same outcomes as a fork's converge (
nothing,no_crew,working,queued).
Where
- Web: Settings → Follow upstream carries Take (the one primary button) and Converge (outline) once an address is followed. Both post to
/:owner/:name/following. - API / MCP:
take_updatesandconvergeanswer for a followed repository as they do for a fork; one that follows nothing isnot_a_fork. - Terminal: on the forks screen of a followed repository, a person who writes it presses
tto take andcto converge, each after a confirm; the toast says the same sentence as the page.
A check moves main too
While following is on, every check of the upstream (the clock's, or Check upstream now) settles the default branch before it reads what is behind, with nobody pressing Take:
- work of this repository's that already landed upstream under other commit ids returns the branch to the upstream's ids, in every mode, since nothing is lost;
- in take-updates mode a branch with nothing of its own fast-forwards to the upstream's tip.
Each move is a push event carrying followed, so what follows a push follows it. Anything else (a branch with work the upstream lacks) is left for Take, a proposal or the crew.
Taking stages the upstream tip in the bare repository (no clone), writes a push event carrying followed, and needs write access.