Git-Workshop.md

@@ -2129,6 +2129,12 @@ site and example sets). At the end of a semester all changes are merged into the
 > A git branch is a sequence of commits. Think of a branch as a copy of a folder
 > containing a copy of source code. Multiple branches can be thought of as
 > multiple parallel folders.
+>
+> At some point you need to reconcile these folders....
+>
+>  - What changes need to be kept?
+>  - What is the process to `merge` changes?
+>  - What are the differences between copies?
 
 Before the Fall 2019 semester I needed to make quite a few updates dealing with
 code style, alongside the normal updates. This lead to four (4) new branches: