1. Why is it important to use `--` when chaging files back to a previous state?<br>
1. Why is it important to use `--` when chaging files back to a previous state?<br>
**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.
**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?<br>
1. Why might you want to reset your files back to a previous commit?<br>
**Answer:** Feature broke, sloppy code, etc.
**Answer:** Feature broke, sloppy code, etc.
<hr>
<hr>
** Commit your work.** <br>
** Commit your work.** <br>
The commit message should read: <br>
The commit message should read: <br>
"The 2nd set of homework answers are complete".
"The 2nd set of homework answers are complete".
<hr>
<hr>
1. What command do you use to create a branch?<br>
1. What command do you use to create a branch?<br>
@ -53,7 +46,7 @@ The commit message should read: <br>
**Answer:** To create a feature / so that your new code doesn't interfere with the working code in the master branch, etc.
**Answer:** To create a feature / so that your new code doesn't interfere with the working code in the master branch, etc.
<hr>
<hr>
** Commit your work.** <br>
** Commit your work.** <br>
The commit message should read: <br>
The commit message should read: <br>
"The 3rd set of homework answers are complete".
"The 3rd set of homework answers are complete".
<hr>
<hr>
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<br>
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<br>
@ -62,10 +55,43 @@ The commit message should read: <br>
**Answer:** `git push` name of your branch if it's not master.
**Answer:** `git push` name of your branch if it's not master.
<hr>
<hr>
** Commit your work.** <br>
** Commit your work.** <br>
The commit message should read: <br>
The commit message should read: <br>
"The 4th set of homework answers are complete".
"The 4th set of homework answers are complete".
<hr>
<hr>
### 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.
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.
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).
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?