From 2fe12ad261852c39b13262b54a030b950f62d5f3 Mon Sep 17 00:00:00 2001
From: gsxdsm <gsxdsm@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:21:39 -0700
Subject: [PATCH] FN-6139: remove unused _baseSha parameter

Remove the unused _baseSha parameter from branch authority checks.

- delete the unused optional _baseSha parameter from isBranchAuthoritativeForTask
- keep branch authority behavior unchanged while simplifying the function signature

Files changed:
 packages/engine/src/branch-conflicts.ts | 1 -
 1 file changed, 1 deletion(-)

Fusion-Task-Id: FN-6139

Fusion-Task-Lineage: 349144fd-2f4a-4a19-a13f-14b2786e97ef
---
 packages/engine/src/branch-conflicts.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/engine/src/branch-conflicts.ts b/packages/engine/src/branch-conflicts.ts
index 5d1d7dfc80..b707933928 100644
--- a/packages/engine/src/branch-conflicts.ts
+++ b/packages/engine/src/branch-conflicts.ts
@@ -377,7 +377,6 @@ export async function isBranchAuthoritativeForTask(
   repoDir: string,
   branch: string,
   taskId: string,
-  _baseSha?: string,
 ): Promise<{ ok: true } | { ok: false; reason: string }> {
   try {
     await revParse(repoDir, `refs/heads/${branch}`);