Backport "Fix #17187: allow patches with same span"#17476

Kordyjan merged 2 commits intorelease-3.3.0scala/scala3:release-3.3.0from

backport-17366scala/scala3:backport-17366Copy head branch name to clipboard