fix: merge 失败时返回错误状态码

2024-10-28 17:34:24 +08:00
parent 7eb5a6502e
commit 300389ebec
1 changed files with 1 additions and 0 deletions
--- 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