From b814cbbedfdd43f854d7fd7fc9bc8e01f7aecfc7 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jonas@lumeo.com>
Date: Wed, 30 Dec 2020 14:18:08 +0100
Subject: [PATCH] Add recommended merge behaviour settings for VSCode +
 rust-analyzer

---
 contrib/ide/vscode/settings.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 contrib/ide/vscode/settings.json

diff --git a/contrib/ide/vscode/settings.json b/contrib/ide/vscode/settings.json
new file mode 100644
index 00000000..3d1cbfd8
--- /dev/null
+++ b/contrib/ide/vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.assist.importMergeBehaviour": "last"
+}