From 6fed85aaf9e92e0c3debcd92c1959f8eaa5c3a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Tue, 22 Jun 2021 19:55:07 +0200
Subject: [PATCH] pull.rebase merges

---
 build/npm/postinstall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 18ccef884a9..2d973599343 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -88,4 +88,4 @@ runtime "${runtime}"`;
 	yarnInstall(watchPath);
 }
 
-cp.execSync('git config pull.rebase true');
+cp.execSync('git config pull.rebase merges');