Learn Enough Developer Tools to Be Dangerous: Command Line, Text Editor, and Git Version Control Essentials

Chapter 10

Intermediate Workflow

In this chapter, we’ll practice and extend the basic workflow introduced in Section 9.3. This will include adding a new directory to our project, learning how to tell Git to ignore certain files, how to branch and merge, and how to recover from errors. Rather than providing an encyclopedic coverage of Git’s many commands, our focus is on covering practical techniques used every day by software developers and other users of Git.

For reference, important commands from this chapter are summarized in Section 10.5.

10.1 Commit, Push, Repeat

We’ll start by adding an image to our site, which involves making a change to an existing file (index.html) while adding a new file in a new directory. The first step is to make ...