From 300389ebec85e36aba68037e854018d22adf96d4 Mon Sep 17 00:00:00 2001
From: shizhendong <shizhendong@zdjizhi.com>
Date: Mon, 28 Oct 2024 17:34:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20merge=20=E5=A4=B1=E8=B4=A5=E6=97=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=8A=B6=E6=80=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/geedge/asw/common/util/RCode.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/net/geedge/asw/common/util/RCode.java b/src/main/java/net/geedge/asw/common/util/RCode.java
index 36e1bf7..99a6351 100644
--- a/src/main/java/net/geedge/asw/common/util/RCode.java
+++ b/src/main/java/net/geedge/asw/common/util/RCode.java
@@ -60,6 +60,7 @@ public enum RCode {
 
 	// GIT
 	GIT_COMMIT_CONFLICT_ERROR(203001, "Commit failed; fix conflicts and then commit the result"),
+	GIT_MERGE_FAILED(203002, "Merge failed"),
 
 
 	// Runner