chore: enable kodiak automerge by dependency type (#286)

erezrokah · web-flow · commit 60adb222671d · 2021-08-25T16:35:46.000+03:00
diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
@@ -1 +1,5 @@
-version = 1
+version = 1
+
+[merge.automerge_dependencies]
+versions = ["minor", "patch"]
+usernames = ["renovate"]
diff --git a/renovate.json5 b/renovate.json5
@@ -3,5 +3,6 @@
   ignorePresets: [':prHourlyLimit2'],
   semanticCommits: true,
   dependencyDashboard: true,
-  automerge: true,
+  automerge: false,
+  rebaseWhen: 'conflicted',
 }

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`ignorePresets: [':prHourlyLimit2'],`
`4`	`4`	`semanticCommits: true,`
`5`	`5`	`dependencyDashboard: true,`
`6`		`- automerge: true,`
	`6`	`+ automerge: false,`
	`7`	`+ rebaseWhen: 'conflicted',`
`7`	`8`	`}`