From 901e2255a22bccd80dbfe577a419d3303a9be07d Mon Sep 17 00:00:00 2001
From: estib <stron@me.com>
Date: Fri, 13 Sep 2024 09:42:12 +0200
Subject: [PATCH] Only show either the divergence warning or upstream count

---
 apps/desktop/src/lib/navigation/TargetCard.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/lib/navigation/TargetCard.svelte b/apps/desktop/src/lib/navigation/TargetCard.svelte
index cbfc09b4f5..0c1e25eae2 100644
--- a/apps/desktop/src/lib/navigation/TargetCard.svelte
+++ b/apps/desktop/src/lib/navigation/TargetCard.svelte
@@ -43,12 +43,11 @@
 				<Tooltip text="The branch your Workspace branches are based on and merge into.">
 					<span class="text-14 text-semibold trunk-label">Target</span>
 				</Tooltip>
-				{#if ($base?.behind || 0) > 0}
+				{#if ($base?.behind || 0) > 0 && !baseBranchDiverged}
 					<Tooltip text="Unmerged upstream commits">
 						<Badge label={$base?.behind || 0} />
 					</Tooltip>
 				{/if}
-				<SyncButton />
 				{#if baseBranchDiverged}
 					<Tooltip text="Your branch has diverged from the target branch">
 						<div>
@@ -56,6 +55,7 @@
 						</div>
 					</Tooltip>
 				{/if}
+				<SyncButton />
 			</div>
 			<div class="base-branch-label">
 				{#if $base?.remoteUrl.includes('github.com')}