From 22b88ac1370f2044b1831975923c28a99fd20bec Mon Sep 17 00:00:00 2001
From: "Christian Weichel (Chris)" <chris@gitpod.io>
Date: Tue, 7 Nov 2023 15:29:42 +0000
Subject: [PATCH] Fix workspace creation

---
 components/local-app/cmd/workspace-create.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/local-app/cmd/workspace-create.go b/components/local-app/cmd/workspace-create.go
index 9c40350056c054..d916173941c79d 100644
--- a/components/local-app/cmd/workspace-create.go
+++ b/components/local-app/cmd/workspace-create.go
@@ -101,6 +101,11 @@ var workspaceCreateCmd = &cobra.Command{
 					},
 					WorkspaceClass: workspaceCreateOpts.WorkspaceClass,
 				},
+				// Without this flag we might not create a new workspce because there's already one running on the same commit.
+				IgnoreRunningWorkspaceOnSameCommit: true,
+				// Note(cw): the CLI cannot handle running prebuilds yet, so we ignore them for now.
+				IgnoreRunningPrebuild:       true,
+				AllowUsingPreviousPrebuilds: true,
 			},
 		))
 		if err != nil {