From bdde3f4fe84f00850276acef4d3666bfdab4ba4e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 30 Dec 2022 11:07:57 -0600
Subject: [PATCH 1/3] vscode: recommend `redhat.vscode-yaml` extension

---
 .vscode/extensions.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 57a35ab4f..d1762aa9a 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,6 +3,7 @@
         "dbaeumer.vscode-eslint",
         "bradlc.vscode-tailwindcss",
         "stylelint.vscode-stylelint",
-        "wix.vscode-import-cost"
+        "wix.vscode-import-cost",
+        "redhat.vscode-yaml"
     ]
 }

From bd923d4ba20e639ba0282b52fd3a09a39505b5a0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 30 Dec 2022 11:08:24 -0600
Subject: [PATCH 2/3] vscode: add schemas to renovate.json, .lintstagedrc.json

---
 .vscode/settings.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4a7155a74..d7ca13345 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,15 @@
     "*.conf.template": "properties"
   },
   "files.eol": "\n",
-  "files.insertFinalNewline": false
+  "files.insertFinalNewline": false,
+  "json.schemas": [
+    {
+      "fileMatch": [".lintstagedrc.json"],
+      "url": "https://json.schemastore.org/lintstagedrc.schema.json"
+    },
+    {
+      "fileMatch": ["renovate.json"],
+      "url": "https://docs.renovatebot.com/renovate-schema.json"
+    }
+  ]
 }

From ef82876522a68e801c89b3f6637f7e2c0b5d767a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 30 Dec 2022 11:08:49 -0600
Subject: [PATCH 3/3] renovate: rebase only on conflict

---
 renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 4fa381091..6cb74fb7d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,5 +5,6 @@
   ],
   "lockFileMaintenance": {
     "enabled": true
-  }
+  },
+  "rebaseWhen": "conflicted"
 }