From 411fc76fcb84edbc50f51f77aca99287417ebb75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com>
Date: Sat, 2 Jul 2022 05:26:09 +0000
Subject: [PATCH] gitpod

---
 .gitpod.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitpod.yml b/.gitpod.yml
index 0826871005..505a5a5138 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -35,6 +35,7 @@ tasks:
       yarn
       yarn bootstrap
     command: |
+      git config pull.rebase false
       rm creator/.env.local
       cp creator/.env creator/.env.local
       sed -i "/^ROOT_URL=*/cROOT_URL=$(gp url 3100)" creator/.env.local