Major suggestion: git reset

[kallewesterling]

Hiya @hackettka. I just wanted to open a major suggestion, which we may want to do.

After "Staging and Committing Changes" and before "Pushing to GitHub," I wonder if we want to introduce the idea of rolling back to a previous version. After all, git is a version control tool, and we present it as a way to avoid the messy folder structures.

Introducing: git reset. Not an easy concept but an essential one. If you have committed things that you then regret (a point that I think we're not introducing in the workshop right now, and would explain why it's good with version control), you can erase all the changes in the working tree, so that the files currently in the directory matches the contents of whichever commit you want to "roll back to."

I had to read up on how to use it last night as I had to roll back a change I had made. I found these tutorials/docs helpful:

• git-reset
• "Doing a hard reset", from John Wiegley's Git from the Bottom Up

It also gives the opportunity to introduce why branching is necessary, and the idea to "do it early and do it often" (a principle of git) is a good practice.