harden release promotion fallback on conflict

2026-07-07 18:14:35 +09:00
parent ce99890dc8
commit e74c296b7e
1 changed files with 1 additions and 2 deletions
@@ -729,7 +729,7 @@ export class AppsService {
              try {
                await this.resolveReleaseMergeByTakingSourceOnConflict(gitBin, workDir, mergeOptions, commitSha, repository);
              } catch {
-                await this.promoteReleaseBySourceSnapshot(gitBin, workDir, mergeOptions, commitSha, targetBranch, repository);
+                await this.promoteReleaseBySourceSnapshot(gitBin, workDir, commitSha, targetBranch, repository);
              }
            }
          }
@@ -781,7 +781,6 @@ export class AppsService {
  private async promoteReleaseBySourceSnapshot(
    gitBin: string,
    workDir: string,
-    mergeOptions: string[],
    commitSha: string,
    targetBranch: string,
    repository: string,