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

A merge from a followed source can't land without its content #9034

shipped production is serving it opened this has it

Landed in pull #9036 · 2 runs

opened this

Seen 2026-11-03, #9032: the crew resolved a conflict with Jay's fork by merging his head while keeping our tree. All 149 of his commits read as merged, one small fix arrived, and git would never offer the rest again. It passed its own checks. I closed it by hand. Follows #8935, which is closed.

Done when:

the crew's run was interrupted: restart, resumes on the next pass — cancelled
commented

Reviewed pull #9036 at its head: ticked A pull that merges a source's head and brings under a set share of that source's diff never lands by itself, trusted or not. It waits for a person, and says what it dropped: commits, files, lines.; The reviewer is told to compare the pull against the source's diff.; A test on two forges does an -s ours merge and sees it held.; The conflict issue's text says plainly: bring the work in; marking it merged without its content is not a resolution..

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs