From 2ff1dedb858055028f59d48dd29e4d99ba63186b Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 15 May 2019 18:51:29 +0200
Subject: [PATCH] fix(gitFs): use force checkout between branches
---
lib/platform/git/storage.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/platform/git/storage.ts b/lib/platform/git/storage.ts
index a01974d8b5..77f581a750 100644
--- a/lib/platform/git/storage.ts
+++ b/lib/platform/git/storage.ts
@@ -202,7 +202,7 @@ class Storage {
'origin/' + branchName,
])).trim();
}
- await git.checkout(branchName);
+ await git.checkout([branchName, '-f']);
await git.reset('hard');
}
}
--
GitLab