chore: set auromerge settings explicitly (#352)

Signed-off-by: msclock <msclock@qq.com>
serious-scaffold · Aug 14, 2024 · 4db920d · 4db920d
1 parent c4fd74f
commit 4db920d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.renovaterc.json b/.renovaterc.json
@@ -6,6 +6,8 @@
     ":enablePreCommit",
     ":maintainLockFilesWeekly"
   ],
+  "automergeType": "pr",
+  "automergeStrategy": "merge-commit",
   "platformAutomerge": true,
   "packageRules": [
     {

diff --git a/template/.renovaterc.json.jinja b/template/.renovaterc.json.jinja
@@ -8,6 +8,8 @@
     ":enablePreCommit",
     ":maintainLockFilesWeekly"
   ],
+  "automergeType": "pr",
+  "automergeStrategy": "merge-commit",
   "platformAutomerge": true,
   "packageRules": [
 [%- if repo_name == 'ss-cpp' %]