From dc71bee5b50aaa59b2fe4535cc288b4aaab481fc Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 9 Aug 2021 15:14:11 -0300 Subject: bootstrap script checkout the latest from origin/prebuilt checking out origin miss the fact that we need to move the local branch pointer to the last remote commit by now, we dont care about the local content of the contrib/merchant-backoffice folder so is ok to always force the checkout --- bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index e3e4d3d4..0ee94f8d 100755 --- a/bootstrap +++ b/bootstrap @@ -34,7 +34,7 @@ autoreconf -if echo "Importing single-page app (from external Git repository)" cd contrib/merchant-backoffice -git checkout prebuilt +git checkout -f origin/prebuilt cp spa.html .. cd ../.. -- cgit v1.2.3