Instructor Notes

Course overview


Collaborating with Git and GitHub


Branching and merging


Merge conflicts


Rewriting history with Git


Pulling and Pushing


End of first session


Managing contributions to code


Demo of opening a PR

Opening a PR has a lot of moving parts to it. It might be confusing and things might fail in a variety of places. To help students with their challenge below, go through the process of creating a PR. Depending on the branch currently active (main or spicy) the process might vary slightly.



Using GitHub actions for continuous integration


Code versions, releases and tags


Collaborative development


End of second session