From dd72238a085a55d64e936a7001e10d07501bb6dc Mon Sep 17 00:00:00 2001
From: "zhangkun9038@dingtalk.com" <zhangkun9038@dingtalk.com>
Date: Mon, 19 May 2025 07:06:44 +0000
Subject: [PATCH] up

---
 tools/mergeme.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/tools/mergeme.sh b/tools/mergeme.sh
index bcb59d8e..332819c3 100755
--- a/tools/mergeme.sh
+++ b/tools/mergeme.sh
@@ -1,7 +1,58 @@
 #!/bin/bash
 
+set -e # 出错立即停止
+
 source_branch=$1
 dest_branch=$2
 
-cp mergetemp.sh /tmp/
-/tmp/mergetemp.sh $source_branch $dest_branch $(pwd)
+# 确保当前目录是 Git 仓库
+if [ ! -d ".git" ]; then
+  echo "⚠️ 当前目录不是一个 Git 仓库"
+  exit 1
+fi
+
+# 获取当前路径
+repo_path=$(pwd)
+
+# 获取当前分支名
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+# 检查是否至少有一个分支匹配 .env 中配置的 TEST_BRANCH 或 DRYRUN_BRANCH
+if [ -f "$repo_path/.env" ]; then
+  export $(grep -v '^#' "$repo_path/.env" | xargs)
+else
+  echo "⚠️ 缺少 .env 文件，请创建并配置 TEST_BRANCH 和 DRYRUN_BRANCH"
+  exit 1
+fi
+
+if [[ "$current_branch" != "$TEST_BRANCH" && "$current_branch" != "$DRYRUN_BRANCH" ]]; then
+  echo "⚠️ 当前分支 '$current_branch' 不符合环境变量配置要求。"
+  echo "请确保当前分支与 .env 文件中的 TEST_BRANCH 或 DRYRUN_BRANCH 配置一致。"
+  echo "TEST_BRANCH=$TEST_BRANCH"
+  echo "DRYRUN_BRANCH=$DRYRUN_BRANCH"
+  exit 1
+else
+  echo "✅ 当前分支 '$current_branch' 符合环境变量配置要求。"
+fi
+
+# 开始合并流程
+echo "🔄 正在切换到目标分支: $dest_branch 并拉取最新代码..."
+git checkout "$dest_branch"
+git pull origin "$dest_branch"
+
+echo "🔄 切换回源分支: $source_branch"
+git checkout "$source_branch"
+
+echo "🔄 正在将 $dest_branch 合并到 $source_branch"
+git merge "$dest_branch"
+
+echo "✅ 合并完成！"
+$()$(
+
+  ---
+
+  ### 📝 使用方法
+
+)$()bash
+cd /home/ubuntu/freqtrade
+./tools/mergeme.sh theforce-noai-test base