Merge pull request #73 from dafyddj/fix/renovate-merge

fix(renovate): set automerge to always `merge-commit`
dafyddj · Nov 14, 2024 · 3411a3a · 3411a3a
2 parents bc1a6c1 + 4f0a97b
commit 3411a3a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/template/template/.github/renovate.json5 b/template/template/.github/renovate.json5
@@ -7,6 +7,7 @@
   "extends": [
     "config:recommended",
   ],
+  "automergeStrategy": "merge-commit",
   "git-submodules": {
     "enabled": true
   },

diff --git a/test/GenerateProject/renovate_json5.tt b/test/GenerateProject/renovate_json5.tt
@@ -7,6 +7,7 @@
   "extends": [
     "config:recommended",
   ],
+  "automergeStrategy": "merge-commit",
   "git-submodules": {
     "enabled": true
   },

diff --git a/test/GenerateProject/template_renovate_json5.tt b/test/GenerateProject/template_renovate_json5.tt
@@ -7,6 +7,7 @@
   "extends": [
     "config:recommended",
   ],
+  "automergeStrategy": "merge-commit",
   "git-submodules": {
     "enabled": true
   },

diff --git a/test/GenerateProjectWithName/renovate_json5.tt b/test/GenerateProjectWithName/renovate_json5.tt
@@ -7,6 +7,7 @@
   "extends": [
     "config:recommended",
   ],
+  "automergeStrategy": "merge-commit",
   "git-submodules": {
     "enabled": true
   },

diff --git a/test/GenerateProjectWithName/template_renovate_json5.tt b/test/GenerateProjectWithName/template_renovate_json5.tt
@@ -7,6 +7,7 @@
   "extends": [
     "config:recommended",
   ],
+  "automergeStrategy": "merge-commit",
   "git-submodules": {
     "enabled": true
   },