From 24041370c00873d5c122012dc5d549c8912a0499 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 18 Aug 2019 12:28:11 -0400
Subject: [PATCH] vscode github pull request default merge method squash

---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ce7a7c74fb..924f4c2db9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -81,6 +81,7 @@
         },
         "git.detectSubmodulesLimit": 20,
         "git.ignoreLimitWarning": true,
+        "githubPullRequests.defaultMergeMethod": "squash",
         "githubPullRequests.telemetry.enabled": false,
         "gitlens.advanced.telemetry.enabled": false,
         "files.associations": {