Hides continue action when a rebase has conflicts

Author: d13

src/webviews/apps/plus/home/components/merge-rebase-status.ts

@@ -134,7 +134,7 @@ export class GlMergeConflictWarning extends LitElement {
 
 		return html`<action-nav>
 			${when(
-				status !== 'revert',
+				status !== 'revert' && !(status === 'rebase' && this.conflicts),
 				() => html`
 					<action-item label="Continue" icon="debug-continue" href=${this.onContinueUrl}></action-item>
 				`,