From e28233a15116ea3c0c86d0216c686215eb2ef6c7 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 29 Mar 2022 09:58:17 -0400 Subject: [PATCH] 18700: Discard local yarn.lock modifications when checking out wb2. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/install/deps.go | 1 + 1 file changed, 1 insertion(+) 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 -- 2.30.2