Add files via upload

ffanyt · Jan 27, 2023 · 4c81a6b · 4c81a6b
1 parent 8e3fade
commit 4c81a6b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/proj2/gitlet/Repository.java b/proj2/gitlet/Repository.java
@@ -435,7 +435,10 @@ public static String getHEAD() {
     public static void merge(String branchName) {
         //找分裂点
         checkStageEmpty();
-        chechBranchExit(branchName);
+        File branchFile = join(BRANCH_DIR, branchName);
+        if (!branchFile.exists()) {
+            printError("A branch with that name does not exist.");
+        }
         HEAD = readHEAD();
         HEAD_BRANCH = readHeadBranch();
         if (HEAD_BRANCH.equals(branchName)) {