From 4a75970aaea421b399757322fcc933c86145610f Mon Sep 17 00:00:00 2001 From: jafrog Date: Tue, 1 Mar 2016 16:08:31 +0000 Subject: [PATCH 01/16] Step 5 --- step5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/step5 b/step5 index 3c75e512d..f4a0a6995 100644 --- a/step5 +++ b/step5 @@ -1,3 +1,3 @@ -Reference: +Reference: -To get to this step `git checkout` the 'step-5' branch and try to visit this file again. \ No newline at end of file +You found two witness intreview files. Take a look inside both of them and save any useful information that comes up into 'interview_info.txt'. Commit the file but don't push it yet! first checkout the 'master' branch again and merge 'step-5' branch into it. From ec211025987664a46e2ad35205f04e2ca7d54996 Mon Sep 17 00:00:00 2001 From: jafrog Date: Fri, 4 Mar 2016 12:29:15 +0000 Subject: [PATCH 02/16] Step 5 merge reference --- reference/step5.md | 4 ++++ step5 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/reference/step5.md b/reference/step5.md index f7fda53d7..4e72fdfcf 100644 --- a/reference/step5.md +++ b/reference/step5.md @@ -7,3 +7,7 @@ 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. diff --git a/step5 b/step5 index f4a0a6995..defe20b36 100644 --- a/step5 +++ b/step5 @@ -1,3 +1,3 @@ -Reference: +Reference: ./reference/step5.md You found two witness intreview files. Take a look inside both of them and save any useful information that comes up into 'interview_info.txt'. Commit the file but don't push it yet! first checkout the 'master' branch again and merge 'step-5' branch into it. From ccc7a1726bebfb32d15b06c8cc97f979d4f00cb6 Mon Sep 17 00:00:00 2001 From: Roi Driscoll Date: Thu, 10 Mar 2016 15:58:18 +0000 Subject: [PATCH 03/16] Edits to step-5 branch --- step5 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/step5 b/step5 index 0ead53e6f..de2dc2476 100644 --- a/step5 +++ b/step5 @@ -1,5 +1,7 @@ -Reference: ./detective_handbook/step5.md +Reference: ./reference/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'. From 4f7b424960f5123f1edc7c01fa3e2a7ed39431a4 Mon Sep 17 00:00:00 2001 From: jafrog Date: Mon, 14 Mar 2016 17:50:58 +0000 Subject: [PATCH 04/16] Note on Vim --- detective_handbook/step5.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/detective_handbook/step5.md b/detective_handbook/step5.md index 4e72fdfcf..b02052510 100644 --- a/detective_handbook/step5.md +++ b/detective_handbook/step5.md @@ -11,3 +11,5 @@ Use `git checkout BRANCH_NAME` to switch "active" or "current" branch. You can c # `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). From a75c50cd462c9852ca2c30462f2db4deca29c06c Mon Sep 17 00:00:00 2001 From: Tommy Williams Date: Wed, 24 Mar 2021 12:09:21 +0000 Subject: [PATCH 05/16] Updated master to main and Vim link --- detective_handbook/step5.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/detective_handbook/step5.md b/detective_handbook/step5.md index b02052510..93a57f5e7 100644 --- a/detective_handbook/step5.md +++ b/detective_handbook/step5.md @@ -1,15 +1,15 @@ # `git branch` -Branches in Git allow you to work on several different versions of your working directory at the same time. When you create a new branch and start tracking your changes they'll be saved only in this new branch. At any moment you can switch back to your original (e.g. "master") branch and all your files will be in the same state you left them before "branching out" regardless of the work you've done in the new branch. +Branches in Git allow you to work on several different versions of your working directory at the same time. When you create a new branch and start tracking your changes they'll be saved only in this new branch. At any moment you can switch back to your original (e.g. "main") branch and all your files will be in the same state you left them before "branching out" regardless of the work you've done in the new branch. -The `git branch` command allows you to see branches you have locally. To see all branches including remote ones type `git branch -a`. +The `git branch` command allows you to see which branches you have locally. To see all branches including remote ones type `git branch -a`. # `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. +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` allows you to merge two branches together. E.g. if your current branch is "main" and you type `git merge more-cats` all the changes in the `more-cats` branch will be applied to the "main" 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). +`git merge` will open your default command line text editor for you to confirm the merge commit message. Your default editor is likley to be Vim (you can check it by typing `echo $EDITOR`) see the PreCourse [section on Vim](https://makersacademy.teachable.com/courses/256825/lectures/3989204). From 2554d45730285bfea162a7c603bb963b640b7374 Mon Sep 17 00:00:00 2001 From: Tommy Williams Date: Wed, 24 Mar 2021 12:15:23 +0000 Subject: [PATCH 06/16] Updated master to main --- step5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/step5 b/step5 index cf1f3fa3f..cbd692924 100644 --- a/step5 +++ b/step5 @@ -4,4 +4,4 @@ You found two witness interview files. Take a look inside both of them and save 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'. +First checkout back into the 'main' branch, and merge the 'step-5' branch into 'main'. From 1e13948f220f345e60ddea3be07468b839c9c614 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Wed, 12 Apr 2023 19:59:46 +0100 Subject: [PATCH 07/16] Created clues.txt and added clues from crimescene --- clues.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 clues.txt diff --git a/clues.txt b/clues.txt new file mode 100644 index 000000000..4cb9d27fe --- /dev/null +++ b/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. From e94de401830f6998e09302e07ac0c50a2bdb4f25 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Wed, 12 Apr 2023 20:11:53 +0100 Subject: [PATCH 08/16] Created possible_witnesses.txt and added 2 suspects from people file --- possible_witnesses.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 possible_witnesses.txt diff --git a/possible_witnesses.txt b/possible_witnesses.txt new file mode 100644 index 000000000..dfca73e08 --- /dev/null +++ b/possible_witnesses.txt @@ -0,0 +1,10 @@ +*************** +To go to the street someone lives on, use the file +for that street name in the 'streets' subdirectory. +To knock on their door and investigate, read the line number +they live on from the file. If a line looks like gibberish, you're at the wrong house. +*************** + +NAME GENDER AGE ADDRESS +Alicia Fuentes F 48 Walton Street, line 433 +Jo-Ting Losev F 46 Hemenway Street, line 390 From 64959f74fe9b4a65f21bef5aa2e82a8f97aeb115 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Wed, 12 Apr 2023 20:19:34 +0100 Subject: [PATCH 09/16] removing the false witnesses list --- possible_witnesses.txt | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 possible_witnesses.txt diff --git a/possible_witnesses.txt b/possible_witnesses.txt deleted file mode 100644 index dfca73e08..000000000 --- a/possible_witnesses.txt +++ /dev/null @@ -1,10 +0,0 @@ -*************** -To go to the street someone lives on, use the file -for that street name in the 'streets' subdirectory. -To knock on their door and investigate, read the line number -they live on from the file. If a line looks like gibberish, you're at the wrong house. -*************** - -NAME GENDER AGE ADDRESS -Alicia Fuentes F 48 Walton Street, line 433 -Jo-Ting Losev F 46 Hemenway Street, line 390 From 0a8e134ffa1466fe98d17217df431832c2c99158 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Wed, 12 Apr 2023 20:20:42 +0100 Subject: [PATCH 10/16] Created possible_witnesses.txt and added 4 suspects from the people liste --- possible_witnesses.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 possible_witnesses.txt diff --git a/possible_witnesses.txt b/possible_witnesses.txt new file mode 100644 index 000000000..f50961589 --- /dev/null +++ b/possible_witnesses.txt @@ -0,0 +1,4 @@ +Annabel Sun F 26 Hart Place, line 40 +Oluwasegun Annabel M 37 Mattapan Street, line 173 +Annabel Church F 38 Buckingham Place, line 179 +Annabel Fuglsang M 40 Haley Street, line 176 From 471d0913812c1906d217053ffea665a2c6fdfd4a Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Thu, 13 Apr 2023 11:18:41 +0100 Subject: [PATCH 11/16] Created interviews.txt and added 2 entries --- interviews.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 interviews.txt diff --git a/interviews.txt b/interviews.txt new file mode 100644 index 000000000..2ac022276 --- /dev/null +++ b/interviews.txt @@ -0,0 +1,2 @@ +SEE INTERVIEW #47246024 +SEE INTERVIEW #699607 From 9ca50461e07abe80e50d3c1cd047f56ec2983a55 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Thu, 13 Apr 2023 12:04:59 +0100 Subject: [PATCH 12/16] Created interview_info.txt and added 2 interviews --- interview_info.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 interview_info.txt diff --git a/interview_info.txt b/interview_info.txt new file mode 100644 index 000000000..62b41adc4 --- /dev/null +++ b/interview_info.txt @@ -0,0 +1,4 @@ +Ms. Sun has brown hair and is not from New Zealand. Not the witness from the cafe. +Interviewed Ms. Church at 2:04 pm. Witness stated that she did not see anyone she could identify as the shooter, that she ran away as soon as the shots were fired. + +However, she reports seeing the car that fled the scene. Describes it as a blue Honda, with a license plate that starts with "L337" and ends with "9" From b978d5e390db59e5ebd46e2fa7b960c2b98300a4 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Thu, 13 Apr 2023 12:57:55 +0100 Subject: [PATCH 13/16] Created suspects.txt and added suspects to it from the vehicles file --- mystery/suspects.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 mystery/suspects.txt diff --git a/mystery/suspects.txt b/mystery/suspects.txt new file mode 100644 index 000000000..7697dd169 --- /dev/null +++ b/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" From 225e521d91b2010296ebb945450e710e79069485 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai <129891558+Shakhrai8@users.noreply.github.com> Date: Thu, 13 Apr 2023 13:21:43 +0100 Subject: [PATCH 14/16] Moved suspects.txt to parent directory --- mystery/suspects.txt => suspects.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mystery/suspects.txt => suspects.txt (100%) diff --git a/mystery/suspects.txt b/suspects.txt similarity index 100% rename from mystery/suspects.txt rename to suspects.txt From 77ec251f0e171ee20e1a67dd61b682a94518be0c Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Thu, 13 Apr 2023 14:02:53 +0100 Subject: [PATCH 15/16] Justice is served --- jail.txt | 1 + 1 file changed, 1 insertion(+) create mode 100755 jail.txt diff --git a/jail.txt b/jail.txt new file mode 100755 index 000000000..462229a4f --- /dev/null +++ b/jail.txt @@ -0,0 +1 @@ +Jeremy Bowers From 8da991f52b7a8466f411fb115696fb72b239c087 Mon Sep 17 00:00:00 2001 From: Yevhen Shakhrai Date: Thu, 13 Apr 2023 14:06:56 +0100 Subject: [PATCH 16/16] Justice is served --- interview_info.txt | 4 ---- interviews.txt | 2 -- possible_witnesses.txt | 4 ---- 3 files changed, 10 deletions(-) delete mode 100644 interview_info.txt delete mode 100644 interviews.txt delete mode 100644 possible_witnesses.txt diff --git a/interview_info.txt b/interview_info.txt deleted file mode 100644 index 62b41adc4..000000000 --- a/interview_info.txt +++ /dev/null @@ -1,4 +0,0 @@ -Ms. Sun has brown hair and is not from New Zealand. Not the witness from the cafe. -Interviewed Ms. Church at 2:04 pm. Witness stated that she did not see anyone she could identify as the shooter, that she ran away as soon as the shots were fired. - -However, she reports seeing the car that fled the scene. Describes it as a blue Honda, with a license plate that starts with "L337" and ends with "9" diff --git a/interviews.txt b/interviews.txt deleted file mode 100644 index 2ac022276..000000000 --- a/interviews.txt +++ /dev/null @@ -1,2 +0,0 @@ -SEE INTERVIEW #47246024 -SEE INTERVIEW #699607 diff --git a/possible_witnesses.txt b/possible_witnesses.txt deleted file mode 100644 index f50961589..000000000 --- a/possible_witnesses.txt +++ /dev/null @@ -1,4 +0,0 @@ -Annabel Sun F 26 Hart Place, line 40 -Oluwasegun Annabel M 37 Mattapan Street, line 173 -Annabel Church F 38 Buckingham Place, line 179 -Annabel Fuglsang M 40 Haley Street, line 176