diff --git a/unit_01/w01d02/homework/w01d02_homework_git_SOLUTIONS.md b/unit_01/w01d02/homework/w01d02_homework_SOLUTIONS.md similarity index 67% rename from unit_01/w01d02/homework/w01d02_homework_git_SOLUTIONS.md rename to unit_01/w01d02/homework/w01d02_homework_SOLUTIONS.md index d47b53c..56cc442 100644 --- a/unit_01/w01d02/homework/w01d02_homework_git_SOLUTIONS.md +++ b/unit_01/w01d02/homework/w01d02_homework_SOLUTIONS.md @@ -1,17 +1,10 @@ -![ga](http://mobbook.generalassemb.ly/ga_cog.png) - # WDI-PANTHALASSA - +## Solutions +w01d02 --- Title: Github Practice
-Type: Homework
-Duration: "0:30 - 1:00"
-Creator: - Kristyn Bryan
- Course: WDIr Panthalassa
-Competencies: Github, command line git commands
-Prerequisites: Github - +Total Commits: 4 +Threshold: 4 --- ### Directions @@ -27,7 +20,7 @@ Click on this link and complete all of the steps in the **Answer:** `git commit -m"YOUR COMMIT MESSAGE HERE"`
** Commit your work.**
-The commit message should read:
+The commit message should read:
"The 1st set of homework answers are complete".
1. What command do you use to pull any changes from the master repository into your local repository?
@@ -35,14 +28,14 @@ The commit message should read:
1. What command do you use to unstage a file?
**Answer:** `git reset` and the name of the file 1. What command do you use to change your files back to how they were after a commit?
-**Answer:** `git checkout --` +**Answer:** `git checkout --` 1. Why is it important to use `--` when chaging files back to a previous state?
**Answer:** It's promising the command line that there are no more options after the '--'. This way if you happen to have a branch named octocat.txt, it will still revert the file, instead of switching to the branch of the same name. 1. Why might you want to reset your files back to a previous commit?
**Answer:** Feature broke, sloppy code, etc.
** Commit your work.**
-The commit message should read:
+The commit message should read:
"The 2nd set of homework answers are complete".
1. What command do you use to create a branch?
@@ -53,7 +46,7 @@ The commit message should read:
**Answer:** To create a feature / so that your new code doesn't interfere with the working code in the master branch, etc.
** Commit your work.**
-The commit message should read:
+The commit message should read:
"The 3rd set of homework answers are complete".
1. Give an example for when you would use `git merge` and give an example for when it would be better to submit a pull request to have your branch merged
@@ -62,10 +55,43 @@ The commit message should read:
**Answer:** `git push` name of your branch if it's not master.
** Commit your work.**
-The commit message should read:
+The commit message should read:
"The 4th set of homework answers are complete".
-### Want more git practice? +### Want more git practice? Check out this [tutorial](http://gitreal.codeschool.com/?utm_source=github&utm_medium=codeschool_option&utm_campaign=trygit) that includes videos about using git and some challenges for you to tackle. +////////////////////////////////////////////////////////////////// +--- +Title: Command Line Murders
+Total Commits: 1 +Threshold: 1 +--- +This commit message should read: +"Found the suspect and sent them to jail". +AND inside the `mystery` folder they should have made a file called `jail` with a file inside with their suspect's name (which should be: Jeremy_Bowers). + +////////////////////////////////////////////////////////////////// +--- +Title: Get to know Slack
+Total Commits: 1 +Threshold: 1 +--- +They will have two questions to answer: +1) Name two things that you just learned about Slack that you didn't know before. + +2) Name one thing that you just learned about that you think would be useful for you to use in the Slack classroom. Why do you think it will be useful? + +////////////////////////////////////////////////////////////////// +--- +Title: Brook & Lyn
+Total Commits: 4 +Threshold: 2 +--- +They should have commits with the following messages: +"Added image links to html" +"Adjusted font, font size, and color" +"uploading a screenshot of my Brook & Lyn homework" +"Moved images to match mockup" +Looking for at least 2 commits. If you could look at their index.html and screenshot, you could comment on those.