Release tooling: Fix not handling merge conflicts#24489

JReinhold merged 1 commit into

nextstorybookjs/storybook:nextfrom

fix-merge-conflict-handlingstorybookjs/storybook:fix-merge-conflict-handlingCopy head branch name to clipboard