handle unrelated history promotion fallback

2026-07-07 18:07:30 +09:00
parent 89b0b7d15c
commit aef91b51bb
1 changed files with 21 additions and 7 deletions
@@ -714,13 +714,27 @@ export class AppsService {
            if (!isUnrelatedHistoryError(message)) {
              throw error;
            }
            try {
              await execFileAsync(gitBin, [
                ...mergeOptions,
                'merge',
                '--allow-unrelated-histories',
                '--no-ff',
                '--no-edit',
                commitSha,
              ], { cwd: workDir });
            } catch {
              await execFileAsync(gitBin, [
                ...mergeOptions,
                'merge',
                '--allow-unrelated-histories',
                '--no-ff',
                '--no-edit',
                '-X',
                'theirs',
                commitSha,
              ], { cwd: workDir });
            }
          }
        } else {
          await execFileAsync(gitBin, [