From ad3afb3b00c0da1b2eb51597b550cbb56697c9e0 Mon Sep 17 00:00:00 2001
From: W1NDes <w1ndes@outlook.com>
Date: Fri, 5 Sep 2025 01:18:42 +0800
Subject: [PATCH] =?UTF-8?q?Add(bat)=EF=BC=9A=E6=B7=BB=E5=8A=A0dev=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E5=90=88=E5=B9=B6=E5=88=B0master=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E7=9A=84=E6=89=B9=E5=A4=84=E7=90=86=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev2master.bat | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 dev2master.bat

diff --git a/dev2master.bat b/dev2master.bat
new file mode 100644
index 000000000..390554572
--- /dev/null
+++ b/dev2master.bat
@@ -0,0 +1,35 @@
+@echo off
+chcp 65001
+echo 开始将dev分支合并到master分支...
+
+REM 检查是否有未提交的更改
+git diff-index --quiet HEAD --
+if %ERRORLEVEL% neq 0 (
+    echo 发现未提交的更改，正在stash...
+    git stash push -m "Auto stash before merge to master"
+    set NEED_POP=1
+) else (
+    set NEED_POP=0
+)
+
+REM 切换到dev分支并更新
+git checkout dev
+git pull origin dev
+
+REM 切换到master分支并合并
+git checkout master
+git pull origin master
+git merge dev --no-ff -m "Merge dev branch to master"
+git push origin master
+
+REM 切回dev分支
+git checkout dev
+
+REM 如果之前有stash，则恢复
+if %NEED_POP%==1 (
+    echo 恢复之前的更改...
+    git stash pop
+)
+
+echo 合并完成！
+pause