diff --git a/src/apps/apps.service.ts b/src/apps/apps.service.ts index 77c4b18..e14c0b7 100644 --- a/src/apps/apps.service.ts +++ b/src/apps/apps.service.ts @@ -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,