Add "Automatic vs. manual merging" reflection

Author: cbuckey-uda

lesson_2_reflections.txt

@@ -58,3 +58,20 @@ the diagram the way we do?
     commit was made.  For merge commits, there was no one state of the files
     before the commit was made, since the merge commit combines two commits
     together, so it makes sense for the merge commit to have two parents.
+
+What are the pros and cons of Git’s automatic merging vs. always doing merges
+manually?
+
+    Git's automatic merging can save the user a lot of time!  Especially when
+    multiple people are working together, merging everything manually could be
+    very painful.
+
+    The downside of automatic merging is that it's not perfect.  Merging the
+    coins branch with the master branch, which included color, resulted in
+    inconsistent visuals, where most items were colored but the coins were not.
+    Git could even make worse mistakes - for example, if one branch deleted a
+    function, and another branch added a call to that function, Git would merge
+    those together with no conflict and the resulting code would be broken.
+
+    Overall, Git's merging can save a lot of time, but it's important to always
+    double check that the code still works after doing a merge.