Git-Workshop.md

@@ -1832,7 +1832,7 @@ git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decora
 <details>
 
 <summary>*Updates since 11 January 2019 - Short Version*</summary>
- 
+
 ```
 * eefa03b (HEAD, origin/s20, origin/master, origin/HEAD, s20, master) Add profiling compilation flags to Review 03 Example 6
 * 2dbf7c6 Update Python pydoc style
@@ -1874,10 +1874,10 @@ git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decora
 * 2a4dc01 Finlalize? ShapeIterator for final Java Shapes example
 * f19ec32 Start custom Java Iterator implementation example
 *   09700e9 Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
-|\  
+|\
 | * 7621d29 Tweak Python Linked List example
 * | dfe3461 Replace ActionListener with lambda in Prime Gui Example
-|/  
+|/
 * 5a6e079 Make another round of tweaks to Python Linked List
 * 564d1f2 Rename Python Linkked List files to follow convention
 * cc8f237 Start tweaks to Python Linked List Example
@@ -1912,25 +1912,25 @@ git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decora
 * 082da8f Refactor output utilities using template trickery
 * 3866422 More string view/utility updates
 *   181c028 Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
-|\  
+|\
 | * 59efca7 Update C++ shapes discussion makefiles
 * | 2292b1a More string view/utility updates
-|/  
+|/
 * 8325ed0 Update utilities library to use string_view
 * 82ff001 Start Example 9 (demo C++20 features - string_view)
 * e1fc4a5 Fix C++ Doxygen to Rustdoc comment oversight
 * 197e7bb Tweak Final C++ Room Renovation Example
 *   de989b5 Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
-|\  
+|\
 | * 8652410 Add std::bind to Example 9
 * | 2198332 Correct spacing in House.h
-|/  
+|/
 * 226e9f7 Update Plant UML Seq Diagram with underlines and aliases
 *   c0ba4cd Merge branch 'f19' of git-community.cs.odu.edu:tkennedy/cs330-examples into f19
-|\  
+|\
 | * a114b8b Add missing typehints to Review 04 Example 7
 * | ebc296e Add Plant UML Seq Diagram example
-|/  
+|/
 * 04b4462 Refactor TicTacToe Python Example 7
 * d83fb14 Review 04 Doc Comment Cleanup based on Google/Sphinx format
 * 860214a Review 04 Style cleanup based on pylint and pycodestyle
@@ -1978,33 +1978,33 @@ git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decora
 * c802d10 Migrate coin flip example to Gradle 5.5.1
 * d331eeb Update Java Toy Example 3 to Gradle 5.5 w/config updates
 *   adadbef (origin/f19-prep) Merge branch 'style-cleanup-java' into f19-prep
-|\  
+|\
 | * 44f48f5 (origin/style-cleanup-java) Review 04 Example 5 cleanup
 * |   047edec Merge branch 'style-cleanup-java' into f19-prep
-|\ \  
-| |/  
+|\ \
+| |/
 | * 4a757c5 Clean up Java ShapeFactory
 * |   52fb874 Merge branch 'style-cleanup-python' into f19-prep
-|\ \  
-| |/  
-|/|   
+|\ \
+| |/
+|/|
 | * a2b4638 (origin/style-cleanup-python) Cleanup Python Tos (Review Set 13)
 * | a21ec9c Add Updated PrimeGenerator from CS 350 (as Example 2)
 * | 9f9a87e Cleanup GuiThread Example
-|/  
+|/
 *   0c54771 Merge branch 'style-cleanup-java' into f19-prep
-|\  
+|\
 | * 89869cc Clean up Java Shapes Example Utilities class
 | * f78b8cb Cleanup Review 07 Example 3
 | * 9250f41 Add Java Stylecheck script
 * | 9a6ed92 Add tox to Python examples with unit tests
-|/  
+|/
 *   502ada5 Merge branch 'style-cleanup-c++' into f19-prep
-|\  
+|\
 | * a40aa36 (origin/style-cleanup-c++) Clean up Review 06
 * |   cf42a9e Merge branch 'style-cleanup-c++' into f19-prep
-|\ \  
-| |/  
+|\ \
+| |/
 | * 3887a48 Clean up Review 01 & 06 Examples
 | * 9a07837 Clean up Review 06 Examples - runShapes.cpp
 | * fe8e2ab Clean up Review 03 Examples
@@ -2019,7 +2019,7 @@ git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decora
 | * ed6d68e Clean up utiltities.{h,cpp} code style
 * | 0fd11e4 Update Shape factory tests
 * | b477c46 Fix style based on pycodestyle report
-|/  
+|/
 * 5e73324 Cleanup python examples
 * 480cf66 Cleanup Shapes Example 7
 * 2d6afdf Cleanup Shapes Example 7
@@ -2066,13 +2066,13 @@ git -C ~/Courses/Reviews/cs330/s20 log --since 'January 1 2019' --graph --decora
 * aea6708 Re-number all post-Java-Toys review example sets to make room for UML Sequence Diagram Discussion
 * af0a5ab Updates from live lecture demos
 *   e91d03b Merge branch 's19' of git-community.cs.odu.edu:tkennedy/cs330-examples into s19
-|\  
+|\
 | * 1087829 Update Python TicTacToe Example with coverage.py support:
 | * c64a5fb Add Python coverage ignore rules
 | * ceeb45e Continued updates to Java Gui Examples (re-number)
 | * a94b592 Continued updates to Java Shape Examples (re-number)
 * | 498f916 Update line breaks based on live discussion
-|/  
+|/
 * 1b7374f Update String Formatting code in Examples 4 through 7
 * 3fff4a3 Update Java Shapes Examples 1 & 2
 * 5b8d956 C++ Shapes edits from recorded lectures
@@ -2122,6 +2122,34 @@ Let us focus on a specific section of the log.
 
 ![Git Log Branch Example](./cs330-branch-snip.PNG)
 
+I normally use a semester-branch scheme for my course materials (i.e., course
+site and example sets). At the end of a semester all changes are merged into the
+`master` branch.
+
+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:
+
+  - style-cleanup-python
+  - style-cleanup-java
+  - style-cleanup-c++
+  - f19-prep
+
+The `f19-prep` branch was the *normal update* branch. The former three branches
+were used for code cleanup based on code linting and style analysis tools.
+
+  - style-cleanup-python
+    - [pylint](https://www.pylint.org/)
+    - [pycodestyle](http://pycodestyle.pycqa.org/en/latest/intro.html)
+  - style-cleanup-java
+    - [checkstyle](https://checkstyle.org/checks.html)
+    - [PMD](https://pmd.github.io/)
+    - [Spotbugs](https://spotbugs.github.io/)
+  - style-cleanup-c++
+    - [cpplint](https://github.com/cpplint/cpplint)
+
+The three *style cleanup* branches were eventually merged into `f19-prep`. The
+`f19-prep` branch was later merged into `f19` and `master`.
+
 ---
 
 ## Workflow Example 2 - This Presentation