Merge pull request #2 from develop-me/release/0.3.0

Release/0.3.0

Author: hanopcan

README.md

@@ -3,13 +3,13 @@
 Tooling: doing things better, faster, smarter
 
 - Day 1: Git
-	- [Presentation](https://docs.google.com/presentation/d/15Z03saKItEj1Tc5d__tXk3uIguPqHvcFIA1Bd2WUffs/edit?usp=sharing)
+	- [Presentation](https://docs.google.com/presentation/d/1QjsZpJ7uY3tX9WdiSXrmwnDNYqWG1BwUBgY8Yez86F4/edit?usp=sharing)
 	- [Template Repo](https://github.com/develop-me/git-simple)
 	- [Challenges](challenges/01/README.md)
 - Day 2: Git Workflows
 	- [Challenges](challenges/02/README.md)
 - Day 3: npm & gulp
-	- [Presentation](https://docs.google.com/presentation/d/13nRo3vZhvsJ5YN5QMp3puS7LQBQvj0qPnePJny3RqjY/edit?usp=sharing)
+	- [Presentation](https://docs.google.com/presentation/d/1EzJYbdqaeqohi9ClAdS40XKy9XQyTmGlEi3q64_Q_SY/edit?usp=sharing)
 	- [Demo](https://github.com/develop-me/gulp-demo)
 	- [Project template](https://github.com/develop-me/gulp-template)
 	- [Challenges](challenges/03/README.md)

challenges/01/01-setup.md

@@ -2,17 +2,21 @@
 
 1) **Create a new project folder with the command line**
 
-	Use `cd  {directory name}` and `mkdir {my new folder}` to navigate to where you'd like to make your new directory and make it.
+	Use `cd  {directory name}` to navigate to where you'd like to make your new directory 
+	
+	Use `mkdir {my new folder}` to make your new directory.
 
-	_Protip: you can drag a file or folder from Finder (Mac) or Explorer (Windows) into terminal to get the full path rather than typing the whole path._
+	_Protip: you can drag a file or directory from Finder (Mac) or Explorer (Windows) into terminal to get the full path rather than typing the whole path._
 
 1) **Start to version manage that new folder**
 
-	Use `git init` inside your new folder (`cd` into the folder first!)  to start version managing the project.
+	`cd` into your new directory first
+
+	Use `git init` inside your new folder to start version managing the project.
 
 1) **Check your Git repository is in place**
 
-	Verify the `.git` directory has been created and Git is ready to go.
+	Verify the `.git` directory has been created inside your project directory - this tells you that Git is ready to go.
 
 	There are a few ways of doing this:
 

challenges/01/02-track-files.md

@@ -12,16 +12,20 @@
 	   scripts.js
 	```
 
+	You can use `touch {filename}` to create files from the command line and `mkdir {dirname}` to create directories. 
+
+	When you run these commands take care that you are in the right directory in your terminal.
+
 1) **Start version managing your files**
 
 	Use `git status` to see what Git thinks is going on.
 
-	Use `git add {filename}` to start tracking the files in your project.
+	Use `git add {filename}` to start tracking individual files in your project.
 
-	Note: you will need to use the full path, e.g. `git add css/style.css`
+	Note: you may need to use the full path, e.g. `git add css/style.css`
 
 	Use `git status` again to see what is the status now.
 
-	Use `git commit -m "A meaningful commit message"` to create your first commit, with the files you had previously added to tracking.
+	Use `git commit -m "Basic project files created"` to create your first commit, with the files you had previously added to tracking. You can change the suggested commit message if you like to come up with something more meaningful.
 
 ## [Next challenge >](03-changes.md)

challenges/01/03-changes.md

@@ -12,8 +12,24 @@
 
 	Use `git commit -m "A useful comment"` to create your next commit, with the files you had previously added to tracking.
 
-1) **Make some more changes**
+1) **Make changes to several files at one**
 
-	Edit 2 or more files, `git add` and commit the changes.
+	Edit 2 or more files at a time, use `git add` to add them and then commit them. You should have multiple files in one commit.
 
-## [Next challenge >](04-info.md)
+1) **Use `git log` to see the recent changes in your project.**
+
+	Study the information and try to relate to the changes you've made and commands you've run.	
+	
+	If your history is too long for your terminal window you'll end up with a `:` prompt at the bottom, as you can use your cursor to go up and down the log. Use `q` to quit.
+
+1) **Put an emoji in the slack channel so your instructor knows you're done.**
+
+## Advanced challenges
+
+These are optional challenges you can do if you finish quickly.
+
+1) **See differences**
+
+Make a change to a file, save it and use git diff to see how you can use the diff tool to see what has changed.
+
+Useful if a git status shows things have been modified but you're not sure what or can't remember what you changed.

challenges/01/04-info.md

@@ -0,0 +1,33 @@
+# Build a simple site
+
+This exercise is to help you practice using Git and to get you used to thinking about how to divide your work into sensible commits. 
+
+**Read through ALL the instructions at least once before you start work** - this will help you plan sensible chunks of work that will form your commits.
+
+- start a new project (new folder, new Git repo)
+- create 3 HTML pages (home, about and contact) each with normal HTML boilerplate: `<html>`, `<head>` and `<body>`.
+- add at least HTML 4 elements to each page `<div>`, `<h1>`, `<p>`, `<img>`
+- create a `css` folder with stylesheet
+- create a `img` folder with image(s)
+- populate with some dummy content eg images
+
+At appropriate points use `git add` and `git commit` to create a snapshot of your progress so far. This may be after creating each page, or when completing each element, this is up to you. Ensure your commit names are meaningful.
+
+- At the end you should aim to have done **at least** 8 commits (use `git log` to see your commits so far)
+- Aim for clear, informative commit messages.
+
+*Note: Don't worry about making your web pages perfect, the purpose is to practice using Git.*
+
+### After you have finished
+- Emoji the task on Slack so the instructor knows you have finished.
+- Share a summary of your commit messages on Slack.
+
+### Stretch challenges
+Only attempt these once you have done all of the above.
+
+If you have time you could:
+
+- add some CSS styling
+- experiment with the -a flag in git commit -am (in the notes PDF box on "git commit arguments")
+- complete the advanced challenge: [Moving files the git way >](05-move-files.md)
+- complete the advanced challenge: [Deleting files the git way >](06-remove-files.md)

challenges/01/04-simple-project.md

@@ -1,5 +1,7 @@
 # Moving/renaming files
 
+This is an advanced task - if you have questions or help please ask your instructor or TA for help outside of the main lectures. The main class will not wait whilst you attempt these.
+
 1) **Use `git mv {old-path} {new-path}` to relocate a file**
 	This stages that change at the same time.
 
@@ -15,4 +17,4 @@
 
 	Commit the change.
 
-## [Next challenge >](08-remove-files.md)
+## [Next challenge >](06-remove-files.md)

challenges/01/07-move-files.md challenges/01/05-move-files.mdchallenges/01/07-move-files.md renamed to challenges/01/05-move-files.md

@@ -1,5 +1,7 @@
 # Remove files from tracking or project
 
+This is an advanced task - if you have questions or help please ask your instructor or TA for help outside of the main lectures. The main class will not wait whilst you complete these.
+
 1) **Remove a file from tracking but keep the file**
 
 	Create a new file if you like, `git add` and `git commit it`.

challenges/01/05-simple-project.md

@@ -13,7 +13,17 @@
 
 	Use `git checkout master` or `git switch -` to get back to the most recent commit.
 
-*`HEAD~` is a shorthand reference for previous commit, as in "one commit ago".*
+1) **Move to a different commit**
+
+	Redo step 1 again, but this time move to a different commit than before.
+
+1) **Use `git reset`**
+
+	Experiment with `git reset --hard HEAD` and `git reset --soft HEAD` to return back to your last commits.
+
+	Keep using `git reflog` to track how you are moving around between your commits.
+
+1) **Add an emoji to slack to let the instructor know you have finished**
 
 ## Advanced
 
@@ -22,3 +32,4 @@
 1) Try and commit those changes
 1) You will find you can't - why is this?
 
+Or for more fun read up about stashing in the notes and give it a whirl.