Alex's CLMystery up to step 6

detective_handbook/step5.md

@@ -7,3 +7,9 @@ The `git branch` command allows you to see branches you have locally. To see all
 # `git checkout`
 
 Use `git checkout BRANCH_NAME` to switch "active" or "current" branch. You can checkout to a new branch even if it's stored in the remote repository. When you do this the branch will be copied to your machine and will be set as "current" branch.
+
+# `git merge`
+
+`git merge` allows you to merge two branches together. E.g. if your current branch is "master" and you type `git merge more-cats` all the changes in the `more-cats` branch will be applied to the "master" branch and a new commit (merge commit) will be created.
+
+`git merge` will open your default editor for you to confirm the merge commit message. If your default editor is set to Vim (you can check it by typing `echo $EDITOR`) see command line [section on Vim](https://github.com/makersacademy/pre_course/blob/master/pills/command_line4.md#vim).

jail.txt

@@ -0,0 +1 @@
+Jeremy Bowers

mystery/clues.txt

@@ -0,0 +1,3 @@
+CLUE: Footage from an ATM security camera is blurry but shows that the perpetrator is a tall male, at least 6'.
+CLUE: Found a wallet believed to belong to the killer: no ID, just loose change, and membership cards for AAA, Delta SkyMiles, the local library, and the Museum of Bash History. The cards are totally untraceable and have no name, for some reason.
+CLUE: Questioned the barista at the local coffee shop. He said a woman left right before they heard the shots. The name on her latte was Annabel, she had blond spiky hair and a New Zealand accent.

mystery/suspects.txt

@@ -0,0 +1,23 @@
+License Plate L337QE9
+Make: Honda
+Color: Blue
+Owner: Erika Owens
+Height: 6'5"
+--
+License Plate L337DV9
+Make: Honda
+Color: Blue
+Owner: Joe Germuska
+Height: 6'2"
+--
+License Plate L3375A9
+Make: Honda
+Color: Blue
+Owner: Jeremy Bowers
+Height: 6'1"
+--
+License Plate L337WR9
+Make: Honda
+Color: Blue
+Owner: Jacqui Maher
+Height: 6'2"

step5

@@ -1,5 +1,7 @@
 Reference: ./detective_handbook/step5.md
 
-You're concerned that the investigation has been compromised. You use an old detective trick to cover your tracks.
+You found two witness interview files. Take a look inside both of them and save any useful information into a new file called 'interview_info.txt'.
 
-To recover your 'step5' file, use the `git checkout` command to check out the 'step-5' branch, and try to view this file again.
+You feel satisfied that you have covered your tracks - time to consolidate your files. Commit the file but DON'T PUSH IT YET!
+
+First checkout back into the 'master' branch, and merge the 'step-5' branch into 'master'.