fix style

ffanyt · Jan 26, 2023 · eb1aec8 · eb1aec8
1 parent 5eb3d0d
commit eb1aec8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/proj2/gitlet/Repository.java b/proj2/gitlet/Repository.java
@@ -264,7 +264,7 @@ public static void rmBranch(String branchName) {
         branchFile = join(BRANCH_DIR, branchName);
         branchFile.delete();
     }
-    public static void reset(String commitID) {//要把对应的branch指示的头提前
+    public static void reset(String commitID) { //要把对应的branch指示的头提前
         HEAD = readHEAD();
         String fullCommitID = updateBranch(commitID);
         updateWorkingdirByCommit(fullCommitID);
@@ -432,4 +432,7 @@ public static void printError(String words) {
     public static String getHEAD() {
         return HEAD;
     }
+    public static void merge(String branchName) {
+
+    }
 }