diff --git a/src/routes/repo/[projectId]/BaseBranchPeek.svelte b/src/routes/repo/[projectId]/BaseBranchPeek.svelte index 38a8a21a4..90234cdd7 100644 --- a/src/routes/repo/[projectId]/BaseBranchPeek.svelte +++ b/src/routes/repo/[projectId]/BaseBranchPeek.svelte @@ -43,7 +43,13 @@ width="full-width" height="small" color="purple" - on:click={updateTargetModal.show} + on:click={() => { + if ($mergeUpstreamWarningDismissed) { + branchController.updateBaseBranch(); + } else { + updateTargetModal.show; + } + }} > Merge into common base