merge conflict: missing stage the conflict file for addition

Emmet-Ray · Jul 14, 2023 · d1ad069 · d1ad069
1 parent 79933a6
commit d1ad069
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 0 deletions.
diff --git a/proj2/gitlet/Repository.java b/proj2/gitlet/Repository.java
@@ -833,6 +833,7 @@ private static boolean generalMerge(String branch) throws IOException {
             case 8:
                 conflict = true;
                 mergeConflict(file, otherVersion, currentVersion);
+                add(file);
                 break;
         }
         return conflict;

diff --git a/proj2/testing/merge-conflicts_3/f.txt b/proj2/testing/merge-conflicts_3/f.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+Another wug.
+=======
+This is not a wug.
+>>>>>>>
diff --git a/proj2/testing/merge-conflicts_3/h.txt b/proj2/testing/merge-conflicts_3/h.txt
@@ -0,0 +1 @@
+Another wug.
diff --git a/proj2/testing/merge-conflicts_3/k.txt b/proj2/testing/merge-conflicts_3/k.txt
@@ -0,0 +1 @@
+And yet another wug.
diff --git a/proj2/testing/merge-conflicts_4/f.txt b/proj2/testing/merge-conflicts_4/f.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+Another wug.
+=======
+This is not a wug.
+>>>>>>>
diff --git a/proj2/testing/merge-conflicts_4/h.txt b/proj2/testing/merge-conflicts_4/h.txt
@@ -0,0 +1 @@
+Another wug.
diff --git a/proj2/testing/merge-conflicts_4/k.txt b/proj2/testing/merge-conflicts_4/k.txt
@@ -0,0 +1 @@
+And yet another wug.
diff --git a/proj2/testing/merge-conflicts_5/f.txt b/proj2/testing/merge-conflicts_5/f.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+Another wug.
+=======
+This is not a wug.
+>>>>>>>
diff --git a/proj2/testing/merge-conflicts_5/h.txt b/proj2/testing/merge-conflicts_5/h.txt
@@ -0,0 +1 @@
+Another wug.
diff --git a/proj2/testing/merge-conflicts_5/k.txt b/proj2/testing/merge-conflicts_5/k.txt
@@ -0,0 +1 @@
+And yet another wug.
diff --git a/proj2/testing/merge-conflicts_6/f.txt b/proj2/testing/merge-conflicts_6/f.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+Another wug.
+=======
+This is not a wug.
+>>>>>>>
diff --git a/proj2/testing/merge-conflicts_6/h.txt b/proj2/testing/merge-conflicts_6/h.txt
@@ -0,0 +1 @@
+Another wug.
diff --git a/proj2/testing/merge-conflicts_6/k.txt b/proj2/testing/merge-conflicts_6/k.txt
@@ -0,0 +1 @@
+And yet another wug.
diff --git a/proj2/testing/merge-rm-conflicts_0/f.txt b/proj2/testing/merge-rm-conflicts_0/f.txt
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+Another wug.
+=======
+>>>>>>>
diff --git a/proj2/testing/merge-rm-conflicts_0/h.txt b/proj2/testing/merge-rm-conflicts_0/h.txt
@@ -0,0 +1 @@
+Another wug.
diff --git a/proj2/testing/merge-rm-conflicts_0/k.txt b/proj2/testing/merge-rm-conflicts_0/k.txt
@@ -0,0 +1 @@
+And yet another wug.
diff --git a/proj2/testing/merge-rm-conflicts_1/f.txt b/proj2/testing/merge-rm-conflicts_1/f.txt
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+Another wug.
+=======
+>>>>>>>
diff --git a/proj2/testing/merge-rm-conflicts_1/h.txt b/proj2/testing/merge-rm-conflicts_1/h.txt
@@ -0,0 +1 @@
+Another wug.
diff --git a/proj2/testing/merge-rm-conflicts_1/k.txt b/proj2/testing/merge-rm-conflicts_1/k.txt
@@ -0,0 +1 @@
+And yet another wug.
diff --git a/proj2/testing/src/conflict2.txt b/proj2/testing/src/conflict2.txt
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+Another wug.
+=======
+>>>>>>>