Updated reading for Week 12: Git and GitHub Workflows

[wmwv]

@pitt1321/class

For this week the reading will be to go back and review Git and GitHub. Specifically, study how branches work, how to pull/push from servers, and what to do in the case of a merge conflict.

• 11/14
  • http://rogerdudler.github.io/git-guide/
  • https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control
• 11/16
  • https://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows
  • https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow

(Yes, some of this reading is retroactive to today. Obviously I don't expect you to read by the light of a tachyon beam, I just find it easier for future reference for myself to list the reading this way.)

[wmwv]

@pitt1321/class The reading quiz for this week will be on Friday and will be about the Git workflow, specifically on Feature Branch workflow.

[wmwv]

@pitt1321/class

Those of you using GitHub Desktop App might find the following useful reading as well

https://help.github.com/desktop/guides/contributing/