Lesson Weekend

At this point, you should have a solid grasp of the basics of git. However, it's likely that some concepts remain intimidating. For instance, merging branches and the possibility of merge conflicts or losing code can still feel scary. Also, the basic underpinnings of how git works (it's based on graph theory) probably aren't very clear.

Check out the site Think Like (a) Git. The site is a comprehensive and fun overview of git by Sam Livingson-Gray, a Ruby developer based in Portland, Oregon.

We recommend reading through each of the sections (which are short, quick reads) starting from the beginning. Also, make sure you read the following sections, which may be particularly useful during team week:

  • Testing Out Merges: This section illustrates several patterns for beginners to merge their code before they move on to "Black Belt Merging."
  • Rebase From the Ground Up: This section goes into more depth about how git rebase and git cherrypick work. You may not use these commands much - yet - but they will be helpful long-term in your growth as a developer.

Lesson 5 of 11
Last updated more than 3 months ago.