From 6a4aa58d036e3966b6accb30b21c9ac1e67c3e0b Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Fri, 15 Nov 2024 16:08:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20mr=20merge=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/app/service/impl/ApplicationMergeServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
index 5367f60..313bf65 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
@@ -252,7 +252,7 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
                 String tgtBranch = entity.getTargetBranch();
 
                 StringBuilder commitMessage = new StringBuilder();
-                commitMessage.append("Merge branch '").append(tgtBranch).append("' into '").append(srcBranch).append("'\n\n");
+                commitMessage.append("Merge branch '").append(srcBranch).append("' into '").append(tgtBranch).append("'\n\n");
                 commitMessage.append(entity.getTitle());
                 commitMessage.append("\n");