... | ... | @@ -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
|
... | ... | |