Fix branch selector confusion during merge/rebase conflicts#2017

jonathanlab merged 2 commits into

mainPostHog/code:mainfrom

posthog-code/fix-branch-selector-during-merge-conflictPostHog/code:posthog-code/fix-branch-selector-during-merge-conflictCopy head branch name to clipboard