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

A fellow forge owner's work lands cleanly and he can pull back: real merges, kept authorship, no squash across forks #8935

Closed opened this has it

Landed in pull #8936

opened this

The owner, 2026-11-02: forge users share their best ideas. "he considers us upstream too so he will pull. ideally it is a smooth experience. this idea is always going to happen." Real case, measured 23:15Z: jmoran/forge-jay on git.open-platform.sh, forked at accaa654 (10-28): 149 commits ahead, 511 behind, 514 files, +26k/-8k, and about 90 files conflict in a trial merge with trevato/forge main.

Today's landing is a squash. Squashing a long fork's work means his next pull conflicts with his own code, every time.

Done when:

3 earlier comments
commented

Reviewed pull #8936 at its head: ticked A pull from a fork or another forge can land as a true merge commit, chosen automatically when it comes from a fork someone keeps, so its commits stay ancestors of main, and each author keeps their name. Crew pulls stay squashed.; docs/ has one page: how to send your forge's idea upstream, and how to pull. Each direction is 3 steps.. left open: A big one can land in reviewed slices that still end as a merge of the author's head: git merge main on his side afterwards is clean or a fast-forward, with a test on two forges. — Slices are not built; the pull says so.; A pull opened on the Forgejo mirror (trevato-apps/forge) reaches trunk (trevato/forge) as a real pull with its author, instead of being stranded on the mirror, and the mirror stays a plain copy of trunk. — Mirror routing is not built; mirrored pulls still answer "mirrored".; Before merging, a preview shows the combined build, and the crew resolves conflicts in a branch on our side, with what it decided written for the author. — No combined-build preview or resolution note exists.; His code runs only under the guest rule (#8903) until a person approves. The author gets a thank-you note with what landed and what changed. — The thank-you note exists, but the guest rule is not built..

commented

Left open after pull #8936 landed: 4 unticked items remain (A big one can land in reviewed slices that still end as a merge of the author's head: git merge main on his side afterwards is clean or a fast-forward, with a test on two forges.; A pull opened on the Forgejo mirror (trevato-apps/forge) reaches trunk (trevato/forge) as a real pull with its author, instead of being stranded on the mirror, and the mirror stays a plain copy of trunk.; Before merging, a preview shows the combined build, and the crew resolves conflicts in a branch on our side, with what it decided written for the author.; …). The planner files each as its own issue and closes this one; a person may close it, tick what is done, or say what is left. Until then the crew does not pick it again.

commented

The landed pull shipped the true merge and the docs page. The open boxes are split into #9010 (reviewed slices that end as a merge of the author's head), #9011 (mirror pulls reach trunk), #9012 (combined preview and conflicts resolved on our side with notes) and #9013 (thank-you note). The guest-rule half of the last box is #8964's work, and its remaining test is #9018. #8950 now waits for #9011.

commented

Add from #9030, seen 2026-11-03: a true merge can land without its content. Mason merged Jay's head keeping our tree, so all his commits read as merged and none of his work arrived. Done when: a merge from a followed source that drops most of its diff is refused for a person, with the size of what it dropped; a test covers it.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs