index 2c9db98a3cfa616c09dcfd340dcd022aeb7c91e0..144bc16ff26bbf1d311482e6be15fc034994ce49 100644 (file)
When things cleanly merge, these things happen:
When things cleanly merge, these things happen:
-1. the results are updated both in the index file and in your
- working tree,
-2. index file is written out as a tree,
-3. the tree gets committed, and
-4. the `HEAD` pointer gets advanced.
+1. The results are updated both in the index file and in your
+ working tree;
+2. Index file is written out as a tree;
+3. The tree gets committed; and
+4. The `HEAD` pointer gets advanced.
Because of 2., we require that the original state of the index
file to match exactly the current `HEAD` commit; otherwise we
Because of 2., we require that the original state of the index
file to match exactly the current `HEAD` commit; otherwise we