From: Tom Clegg <tom@curii.com>
Date: Tue, 29 Mar 2022 13:58:17 +0000 (-0400)
Subject: 18700: Discard local yarn.lock modifications when checking out wb2.
X-Git-Tag: 2.5.0~214^2~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e28233a15116ea3c0c86d0216c686215eb2ef6c7

18700: Discard local yarn.lock modifications when checking out wb2.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/install/deps.go b/lib/install/deps.go
index b38db99192..069ffd0a2b 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -497,6 +497,7 @@ else
   cd arvados-workbench2
   if ! git checkout $V; then
     git fetch
+    git checkout yarn.lock
     git checkout $V
   fi
 fi