Don't show update-pr-from-base-branch when there are conflicts#3879

fregante merged 7 commits intomasterrefined-github/refined-github:masterfrom

dont-update-branch-on-conflictrefined-github/refined-github:dont-update-branch-on-conflictCopy head branch name to clipboard