handle unrelated history promotion fallback

2026-07-07 17:59:41 +09:00
parent d55fe0c251
commit 85cd5ebcd5
1 changed files with 6 additions and 4 deletions
@@ -688,10 +688,12 @@ export class AppsService {
            if (!isUnrelatedHistoryError(message)) {
              throw error;
            }
-            throw new BadRequestException(
+            await execFileAsync(gitBin, [
-              `${repository} release 브랜치 승격 실패: ${message}.` +
+              'merge',
-              ' release 브랜치가 다른 시작점 히스토리를 가지고 있어 fast-forward로 병합할 수 없습니다.',
+              '--allow-unrelated-histories',
-            );
+              '--no-ff',
              commitSha,
            ], { cwd: workDir });
          }
        } else {
          await execFileAsync(gitBin, [