Actually Using Git to Track Changes

This workshop delves into some of the key concepts you need to understand in order to fully use git.

Learning Objectives

After this workshop you will know how to

Use git branches to track different work
Compare the contents of git branches
Push git branches to remote repositories and pull them down from remote repositories
Merge commits from one git branch into another
View merge conflicts with a text editor and with a visual merge tool
Rename and delete git branches
Check out a specific git commit

Bonus Objectives:

If you do the bonus lessons, you will learn how to

Use Git blame to trace changes in a file
Edit your git history with git rebase and amend

Lessons

Creating and Merging Conflicts on Git Branches

Bonus Lessons