From afa676314e00b20f92beefbfee6e7327d4dc7ba3 Mon Sep 17 00:00:00 2001
From: "sayurinana(vm)" <sayurinana@163.com>
Date: Wed, 17 Dec 2025 06:00:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(flow):=20=E4=BF=AE=E5=A4=8D=20=5Fmerge=5Fno?=
 =?UTF-8?q?rmal=20=E4=BD=BF=E7=94=A8=20merge=5Fsquash=20=E6=9B=BF=E4=BB=A3?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=20reset=5Fsoft=20=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aide-program/aide/flow/branch.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aide-program/aide/flow/branch.py b/aide-program/aide/flow/branch.py
index e3e52dd..b8c622c 100644
--- a/aide-program/aide/flow/branch.py
+++ b/aide-program/aide/flow/branch.py
@@ -319,9 +319,9 @@ class BranchManager:
         branch_info: BranchInfo,
         task_summary: str,
     ) -> tuple[bool, str]:
-        """正常合并流程：软重置 + 压缩提交"""
+        """正常合并流程：squash 合并任务分支到源分支"""
         source_branch = branch_info.source_branch
-        start_commit = branch_info.start_commit
+        task_branch = branch_info.branch_name
 
         # 切换分支前清理 lock 文件，避免冲突
         self._cleanup_lock_file()
@@ -329,8 +329,8 @@ class BranchManager:
         # 切回源分支
         self.git.checkout(source_branch)
 
-        # 软重置到起始提交
-        self.git.reset_soft(start_commit)
+        # squash 合并任务分支
+        self.git.merge_squash(task_branch)
 
         # 创建压缩提交
         self.git.add_all()