An upstream update that conflicts is one issue (#13168)

When a followed upstream's update cannot merge into a fork, the forge opens one issue on the fork, labelled upstream-conflict, naming the range (fork base..upstream tip) and the files changed on both sides. A moved head rewrites that issue; a clean merge, or the fork taking the head, closes it. Only the labelled issue is the forge's: a person's issue with the same title is left alone. A source followed through follow_sources keeps its own issue and never touches this one.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs