From e5b7dd8e7ad3712c1b15228e6948909fd55d20f2 Mon Sep 17 00:00:00 2001
From: Louis Knight-Webb <louis@bloop.ai>
Date: Thu, 3 Jul 2025 16:40:17 +0100
Subject: [PATCH] The change has been made. When a branch is merged
 (`branchStatus.merged` is true), the component will no longer display either
 "commits behind" or "commits ahead" status, showing only the "Up to date"
 message or null instead. (#59)

---
 frontend/src/pages/task-attempt-compare.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/task-attempt-compare.tsx b/frontend/src/pages/task-attempt-compare.tsx
index fc9693c5..4332f980 100644
--- a/frontend/src/pages/task-attempt-compare.tsx
+++ b/frontend/src/pages/task-attempt-compare.tsx
@@ -601,19 +601,19 @@ export function TaskAttemptComparePage() {
                 <GitBranch className="h-4 w-4" />
                 {branchStatus.up_to_date ? (
                   <span className="text-green-600">Up to date</span>
-                ) : branchStatus.is_behind === true ? (
+                ) : branchStatus.is_behind === true && !branchStatus.merged ? (
                   <span className="text-orange-600">
                     {branchStatus.commits_behind} commit
                     {branchStatus.commits_behind !== 1 ? 's' : ''} behind{' '}
                     {branchStatus.base_branch_name}
                   </span>
-                ) : (
+                ) : !branchStatus.merged ? (
                   <span className="text-blue-600">
                     {branchStatus.commits_ahead} commit
                     {branchStatus.commits_ahead !== 1 ? 's' : ''} ahead of{' '}
                     {branchStatus.base_branch_name}
                   </span>
-                )}
+                ) : null}
               </div>
               {branchStatus.has_uncommitted_changes && (
                 <div className="flex items-center gap-1 text-yellow-600">