From b0da3455a352c4a2c45c1b9c9dc3eddefc117fb3 Mon Sep 17 00:00:00 2001
From: Jon Surrell <jon.surrell@automattic.com>
Date: Fri, 25 Oct 2019 16:51:30 +0200
Subject: [PATCH 1/4] No nvmrc symlink

---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 120000 => 100644 .nvmrc

diff --git a/.nvmrc b/.nvmrc
deleted file mode 120000
index fdcf1c129..000000000
--- a/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-calypso/.nvmrc
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..d19159826
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+10.16.3

From cfac5bef8714d0047674795283a1864e18cb955d Mon Sep 17 00:00:00 2001
From: Jon Surrell <jon.surrell@automattic.com>
Date: Fri, 25 Oct 2019 16:57:25 +0200
Subject: [PATCH 2/4] Warn on version mismatch (no error)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5c3d51852..7427be34a 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ CURRENT_NODE_VERSION := $(shell node --version | sed -n 's/v\{0,1\}\(.*\)/\1/p')
 # Check that the current node & npm versions are the versions Calypso expects to ensure it is built safely.
 check-node-version-parity:
 ifneq ("$(CALYPSO_NODE_VERSION)", "$(CURRENT_NODE_VERSION)")
-	$(error Please ensure that wp-desktop is using NodeJS $(CALYPSO_NODE_VERSION) to match wp-calypso before continuing. 	Current NodeJS version: $(CURRENT_NODE_VERSION))
+	$(warning Please ensure that wp-desktop is using NodeJS $(CALYPSO_NODE_VERSION) to match wp-calypso before continuing. 	Current NodeJS version: $(CURRENT_NODE_VERSION))
 else 
 	@echo $(GREEN)$(CHECKMARK) Current NodeJS version is on par with Calypso \($(CALYPSO_NODE_VERSION)\) $(RESET)
 endif

From fd626ffbfc132340e066a22cddf311505e5ab4b4 Mon Sep 17 00:00:00 2001
From: Jon Surrell <jon.surrell@automattic.com>
Date: Fri, 25 Oct 2019 17:10:29 +0200
Subject: [PATCH 3/4] Use node 12 calypso branch

---
 calypso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calypso b/calypso
index 4897b4d32..0d586ad9f 160000
--- a/calypso
+++ b/calypso
@@ -1 +1 @@
-Subproject commit 4897b4d32c6ac5c58f01709caf80db163c9921a8
+Subproject commit 0d586ad9f2c831891fc90508a5991918b4a6968b

From e9c6a14e234e885450f9c19a2b11638fe5f07eda Mon Sep 17 00:00:00 2001
From: Jon Surrell <jon.surrell@automattic.com>
Date: Fri, 25 Oct 2019 17:12:01 +0200
Subject: [PATCH 4/4] Revert "Use node 12 calypso branch"

This reverts commit fd626ffbfc132340e066a22cddf311505e5ab4b4.
---
 calypso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calypso b/calypso
index 0d586ad9f..4897b4d32 160000
--- a/calypso
+++ b/calypso
@@ -1 +1 @@
-Subproject commit 0d586ad9f2c831891fc90508a5991918b4a6968b
+Subproject commit 4897b4d32c6ac5c58f01709caf80db163c9921a8