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

When an upstream update conflicts with a fork's change, the forge files one issue for the crew naming both sides and the files #13484

shipped production is serving it opened this has it

Landed in pull #13499 · run

opened this

Intent: conflicts go to the crew, not to the owner's lap.

Done:

Risks: never force a merge; the fork stays buildable. Suggested: torque. Files: src/core/fork_follow.ts, test/fork-follow-conflict.test.ts

commented

Reviewed pull #13499 at its head: ticked a fork that follows automatically and meets a conflicting update stops that update, leaves its code as it was, and opens one issue naming the upstream commit, the fork's change and each conflicted file; a second attempt for the same upstream commit does not open a second issue; test: a seeded conflict opens exactly one issue; a clean update opens none.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs