From 2b8517281cfee059a88e984ef2016c54eb65c337 Mon Sep 17 00:00:00 2001
From: Alex Netsch <alex@bloop.ai>
Date: Thu, 23 Oct 2025 17:29:24 +0100
Subject: [PATCH] Always enable merge/rebase (vibe-kanban) (#1090)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Done! I've successfully removed all the branch status conditions that were disabling the merge and rebase buttons:

## Changes Made to `GitOperations.tsx`:

1. **Merge button** (line 433) - ✅ Removed `Boolean((branchStatus.commits_behind ?? 0) > 0) ||`
   - Now enabled regardless of whether branch is behind

2. **PR/Push button** (line 452) - ✅ Removed `Boolean((branchStatus.commits_behind ?? 0) > 0) ||`
   - Now enabled regardless of whether branch is behind

3. **Rebase button** (line 477) - ✅ Removed `(branchStatus.commits_behind ?? 0) === 0`
   - Now enabled regardless of whether branch is behind or not

All three buttons will now be available at all times, with the remaining safety checks still in place:
- Still disabled during active conflicts
- Still disabled when operations are in progress
- Still disabled when attempt is running
- Merge still disabled when there's an open PR

* fmt
---
 frontend/src/components/tasks/Toolbar/GitOperations.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/frontend/src/components/tasks/Toolbar/GitOperations.tsx b/frontend/src/components/tasks/Toolbar/GitOperations.tsx
index 1875b190..b0da6786 100644
--- a/frontend/src/components/tasks/Toolbar/GitOperations.tsx
+++ b/frontend/src/components/tasks/Toolbar/GitOperations.tsx
@@ -430,7 +430,6 @@ function GitOperations({
                 mergeInfo.hasOpenPR ||
                 merging ||
                 hasConflictsCalculated ||
-                Boolean((branchStatus.commits_behind ?? 0) > 0) ||
                 isAttemptRunning ||
                 ((branchStatus.commits_ahead ?? 0) === 0 &&
                   !pushSuccess &&
@@ -449,7 +448,6 @@ function GitOperations({
               onClick={handlePRButtonClick}
               disabled={
                 pushing ||
-                Boolean((branchStatus.commits_behind ?? 0) > 0) ||
                 isAttemptRunning ||
                 hasConflictsCalculated ||
                 (mergeInfo.hasOpenPR &&
@@ -470,12 +468,7 @@ function GitOperations({
 
             <Button
               onClick={handleRebaseDialogOpen}
-              disabled={
-                rebasing ||
-                isAttemptRunning ||
-                hasConflictsCalculated ||
-                (branchStatus.commits_behind ?? 0) === 0
-              }
+              disabled={rebasing || isAttemptRunning || hasConflictsCalculated}
               variant="outline"
               size="xs"
               className="border-warning text-warning hover:bg-warning gap-1 shrink-0"