enable merge editor for the team

jrieken · jrieken · commit 7c78e2ea8ec9 · 2022-06-27T12:55:05.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -73,6 +73,7 @@
 	],
 	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
 	"git.branchRandomName.enable": true,
+	"git.mergeEditor": true,
 	"remote.extensionKind": {
 		"msjsdiag.debugger-for-chrome": "workspace"
 	},
