From 115b262a373b6a50bb87f617d6c86e57810ca785 Mon Sep 17 00:00:00 2001
From: kenan <166354929+kenanaptx4869@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:28:06 +0800
Subject: [PATCH] Update main.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

这种策略会创建一个新的合并提交，将本地和远程的更改合并在一起。
---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 86ad0f1..d837bab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,8 +50,10 @@ jobs:
         password: ${{ secrets.REMOTE_PASS }}
         port: ${{ secrets.REMOTE_PORT }}
         script: |
+          git config pull.rebase false # 这种策略会创建一个新的合并提交，将本地和远程的更改合并在一起。
           cd /www/wwwroot/8.152.0.253/something0408  # 替换为您的项目在服务器上的位置
           git pull origin gh-pages # 拉取最新代码
+       
         
 
     # - name: copy dist file with scp