First pass on updating the git branch lesson

[kaidamasaki]

Description

A few sentences describing the overall purpose of these textbook changes.

Questions for the Author

• Have you updated the weekly learning goals in the pedagogy resource?
• Have you updated the weekly assessment in Schoology?
• Have you added links to the source (lucidchart, draw.io) for any diagram?
• Have you updated the READMEs with links to new or moved resources?

Todos

Are any of these items still in progress?

• Section X still needs some more detailed examples
• Still need to add "Additional Resources"

Feedback Requested

Please utilize the built-in GitHub Reviewers functionality to assign necessary reviewers. Use this section to further specify portions of the PR that you would like additional or focused feedback on.

[tildeee]

I think that this is good material, but we'll want the PR material on a different document.

I predict that teaching PRs and branches separately would be better to build/reinforce the ideas, and also not conflate the concepts

[dHelmgren]

I think this lesson needs to focus on how Branches work, probably with visual reinforcement of what branching means to the flow of code. Also, I'd include a bit on how to recover if you start working on the wrong branch.

[kaidamasaki]

(Force pushed because I realized I fixed links slightly incorrectly.)

[kaidamasaki]

Notes from Devin's git branch lecture:

• Drew a diagram on the whiteboard about how branches work. (Railroadish with dots for commits.)
• Explained that if you work on your own branch then you aren't stepping on anyone else's toes. Provides a safe space to work in without causing problems.
• This is very useful because we want to commit as frequently as possible since this makes error recovery easier.
• Introduced the concept of branches. (Entirely separate copies of the repo.)
• Demonstrated stash for fixing starting on the wrong branch.
• Talked about (merge) conflict resolution.
• Dinosaur Archeologists? Criminal Detectives?
• Before you push to master you should make sure to merge master into your own branch.

[kaidamasaki]

Week 10: Think about Git Branching

[kaidamasaki]

Week 12: intro to PRs