Register now

31 March 2015 09:30AM-05:00PMthoughtbot @ American Underground, Raleigh

Intermediate Git

Git is an incredibly powerful distributed source control system. Increase your effectiveness with Git by solidifying basic Git concepts like writing good commit messages and learning about intermediate concepts.

This one-day, language-agnostic workshop will work through common workflows and problem solving on the command line with Git. We'll introduce you to important Git concepts like  branching, merging, tagging, merge conflict resolution and successfully working with Git in a team environment. We'll also talk about how thoughtbot uses Git and GitHub on our projects.


Syllabus

Source control basics

  • Centralized vs. Decentralized
  • What Git is and how it works

Basics Recap: Git's happy path

  • Creating a repository
  • Cloning an existing repository
  • Creating a branch
  • Committing code and writing good commit messages
  • origin servers
  • git push
  • git log basics

Intermediate situations and tools, Part I

  • Spelunking with git blame and git log
  • Tagging
  • Branching

Intermediate situations and tools, Part II

  • Merging branches
  • Squash merging branches
  • Rebasing

Intermediate situations and tools, Part III

  • Resolving merge conflicts
  • Rewriting Git history

A good Git workflow for small teams

  • Tying it all together: How thoughtbot uses Git

All you need to know

You'll need a laptop with a recent version of Git and SSH installed and a free day. You should be comfortable working on the command line, able to clone a repository, make a commit, and push your changes to a remote origin server. Our workshop will take it from there.

Intermediate Git is a one day workshop, costing $449, including lunch. The workshop runs from 9:30 am to 5 pm.

Sign up with your email address, and we'll contact you to arrange payment by PayPal, invoice, or your favorite payment method.

Register now

This event is brought to you by thoughtbot.