VersionControl_Git_part_2

Version Control - Part 2

In this class we'll discuss the second-level features of Git (branch,diff, merge) as well as the collaborative and project management features of GitHub.

Required readings (before class)

• Notes: tex/Git_Part2.pdf
• Blischak et al. 2016. A Quick Introduction to Version Control with Git and GitHub

To do (before class)

• Create a 'Sandbox' repository for yourself (if you prefer not to try out the following in your project repo.)

Class structure

Mix of demonstration and discussion and exercises for each topic:

• Branching (Git)
• Diff & Merge (Git)
• Pull requests (GitHub)
• Going back in time (Git)
• Forks (GitHub)
• Issue tracking (GitHub)
• Project boards (GitHub)
• Showcase some repos (remaining time)

Further readings

• Chacon & Straub. Pro Git - Git Branching
• GitHub guides (quick-start style)
• GitHub manual - Collaboration features (forks, branches, pull requests, merge conflicts, etc.)
• GitHub manual - Using Issues & Project boards
• Atlassian - Git Rebase
• Make your repo DOI-citeable

Showcase repositories

• Analytical Workflows (Yes, the repository you're already in!)
• Stouffer & Novak - general-functional-responses
• Palmer Penguins