Set Up Your Git Scenario Environment

This stuff is a lot more fun if you try it out. Let’s create a sample repository to play with:

1. Create a repository on GitHub.com and clone it to your desktop.
2. Create a new branch, call it test.
3. Create a series of commits that give you a rich history to practice the scenarios in this course. Feel free to use this handy script to generate them for you:

   • Bash:

      for d in {1..6};
      do touch file$d.md;
      git add file$d.md;
      git commit -m "adding file $d";
      done
      - **PowerShell:**
     
      for ($d=1; $d -le 6;$d++) {
        touch file$d.md;
        git add file$d.md;
        git commit -m "adding file$d.md";
      }
     

You’re ready to rock!

Using git log

If you type git log --oneline, your commit history should include several commits that look something like this:

5950a1b adding file 4

Those first 7 characters are going to be unique to your machine and are a section of the SHA-1 hash assigned to that specific commit (the SHA-1 hash is 40 characters long). We are going to use that hash identifier a lot as we learn how to git out of sticky situations.

New UI Addition

When trying to get out of a pickle, the best tool for the job is typically dependent on if you pushed your commits to your remote (or not). Look for these drop downs throughout the course:

They will help you find the right instructions for each situation.