Merge pull request #311 from XMOJ-Script-dev/small-fix

A Small fix
XMOJ-Script-dev · Dec 19, 2023 · 7dada97 · 7dada97
2 parents 0baf4ed + 7e5cc54
commit 7dada97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Update/UpdateToRelease.js b/Update/UpdateToRelease.js
@@ -65,6 +65,7 @@ var NewJSFileContent = JSFileContent.replace(/@version(\s+)\d+\.\d+\.\d+/, "@ver
 writeFileSync(JSFileName, NewJSFileContent, "utf8");
 console.warn("XMOJ.user.js has been updated.");
 
+execSync("git config pull.rebase false");
 execSync("git pull");
 execSync("git push origin --delete actions/temp || true");
 execSync("git checkout -b actions/temp");

diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js
@@ -80,6 +80,7 @@ writeFileSync(JSONFileName, JSON.stringify(JSONObject, null, 4), "utf8");
 
 console.warn("Update.json has been updated.");
 
+execSync("git config pull.rebase false");
 execSync("git pull");
 execSync("git commit -a -m \"" + CommitMessage + "\"");
 execSync("git push -f");