Report

1. Draw your final hand-written git history graph including commit messages and use it to answer the following questions:

2. In your subteam workflow, what was the practical difference between a commit and a push? Describe it using one concrete moment from your activity.

3. Your team did not work directly on main (except when first setting up the repository). Explain how this branch-based approach helped your subteam work in parallel.

4. What role did the pull request play beyond “merging code” in your process?

5. Why did your final history contain multiple branch lines instead of one linear sequence? Give an example based on your git history graph.

6. Your README conflict was intentional. Explain exactly why Git could not merge automatically in that moment.

7. Describe how your team resolved that conflict? Did you resolve it in a branch before final merge to main? Indicate the relevant parts of your git history graph in your answer.

8. Why did you have to clear notebook outputs before committing?

9. Identify a merge commit in your hand-draw git history graph. What tells you it should be identified as a merge commit?

10. Did you do a merge of main into one of the feature branches? If so, indicate it and explain what it did. If not, explain why it was not needed.

By Tom van Woudenberg, Delft University of Technology. CC BY 4.0, more info on the Credits page of Workbook.