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

An upstream's update that conflicts with a fork goes to the crew as one issue naming the files, not a silent stop #13168

shipped production is serving it opened this has it

Landed in pull #13185 · run

opened this

Intent: forks choose how they follow upstream; conflicts go to the crew.

Done:

Files: src/actions/upstream_follow.ts, test/upstream-conflict-issue.test.ts Risks: issue spam; key the issue on the fork and upstream head. Suggested: mason.

commented

Reviewed pull #13185 at its head: ticked when following an upstream stops on a conflict (src/actions/upstream_follow.ts), one issue is opened on the fork naming the conflicting files and the upstream commit range; a repeat stop updates it, never opens a second; the fork's page says 'update waiting: conflicts, with the crew' linking the issue; test: conflict opens one issue, repeat does not duplicate, resolution closes it.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs