diff options
Diffstat (limited to 'script/beta.ts')
| -rwxr-xr-x | script/beta.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/script/beta.ts b/script/beta.ts index ff511d928..7884fd248 100755 --- a/script/beta.ts +++ b/script/beta.ts @@ -49,9 +49,9 @@ async function main() { continue } - // Try to squash merge the PR directly + // Try to squash merge the PR directly (allow unrelated histories since beta starts fresh from dev) console.log(` Attempting to merge PR #${pr.number}...`) - const merge = await $`git merge --squash pr-${pr.number}`.nothrow() + const merge = await $`git merge --squash --allow-unrelated-histories pr-${pr.number}`.nothrow() if (merge.exitCode !== 0) { console.log(` Squash merge failed for PR #${pr.number}`) console.log(` Error: ${merge.stderr}`) |