Merge conflict resolution: keep 12-hour buffer and add automerge rules

github-actions[bot] · github-actions[bot] · commit 516ec14567d9 · 2026-01-17T01:04:37.000Z
Co-authored-by: Justin Bennett &lt;just-be-dev@users.noreply.github.com&gt;

Merge branch 'main' into renovate/bun-1.x
diff --git a/renovate.json5 b/renovate.json5
@@ -4,7 +4,7 @@
     "config:best-practices",
     "mergeConfidence:all-badges"
   ],
-  "minimumReleaseAge": "7 days",
+  "minimumReleaseAge": "7 days 12 hours"
   "packageRules": [
     {
       "description": "Automerge TypeScript type definitions if CI passes",

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"config:best-practices",`
`5`	`5`	`"mergeConfidence:all-badges"`
`6`	`6`	`],`
`7`		`- "minimumReleaseAge": "7 days",`
	`7`	`+ "minimumReleaseAge": "7 days 12 hours"`
`8`	`8`	`"packageRules": [`
`9`	`9`	`{`
`10`	`10`	`"description": "Automerge TypeScript type definitions if CI passes",`