fix(merge): refuse unresolved conflicts in merge's own name#3587

max-sixty merged 1 commit into

mainmax-sixty/worktrunk:mainfrom

rebase-in-progress-precheckmax-sixty/worktrunk:rebase-in-progress-precheckCopy head branch name to clipboard