From 42225906abae7cf5c7b59cba61793cb0fbdd4b5b Mon Sep 17 00:00:00 2001 From: radishzzz Date: Thu, 29 May 2025 09:59:17 +0100 Subject: [PATCH] fix: refusing to merge unrelated histories --- scripts/update-theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-theme.ts b/scripts/update-theme.ts index cb4312d..fde7414 100755 --- a/scripts/update-theme.ts +++ b/scripts/update-theme.ts @@ -14,7 +14,7 @@ try { execSync('git fetch upstream', { stdio: 'inherit' }) const beforeHash = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim() - execSync('git merge upstream/master', { stdio: 'inherit' }) + execSync('git merge upstream/master --allow-unrelated-histories', { stdio: 'inherit' }) const afterHash = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim() if (beforeHash === afterHash) {