reonokiy/blog
1
0
Fork 0
mirror of https://github.com/reonokiy/blog.nokiy.net.git synced 2025-06-15 11:12:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: refusing to merge unrelated histories

Browse source
This commit is contained in:
radishzzz 2025-05-29 09:59:17 +01:00
parent cb55fc4090
commit 42225906ab
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/update-theme.ts
View file

@ -14,7 +14,7 @@ try {
execSync('git fetch upstream', { stdio: 'inherit' }) execSync('git fetch upstream', { stdio: 'inherit' })
const beforeHash = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim() 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() const afterHash = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim()
if (beforeHash === afterHash) { if (beforeHash === afterHash) {