1. Steve Losh
  2. slides

Commits

Steve Losh  committed 983ec27

More work on the version control slides.

  • Participants
  • Parent commits c406eb7
  • Branches default

Comments (0)

Files changed (6)

File use-version-control/images/reality.png

Added
New image

File use-version-control/images/restore-2.png

Added
New image

File use-version-control/images/restore-latest.png

Added
New image

File use-version-control/images/site-no-kittens.png

Added
New image

File use-version-control/images/site-with-kitten.png

Added
New image

File use-version-control/use-version-control.md

View file
 
 !SLIDE images
 
-# You've got a folder containing with your website
+# You've got a folder containing your website
 
-![alt text](/url/of/img.jpg "Title")
+![Normal website folder](images/site-no-kittens.png "Screenshot of a normal website folder")
 
 
 !SLIDE
 
 # Now add another folder inside it, containing magic kittens
 
-![alt text](/url/of/img.jpg "Title")
+![Version controlled website folder](images/site-with-kitten.png "Screenshot of a version controlled website folder")
+
+
+!SLIDE images
+
+# The kittens will keep track of each version of your website
+
+
+!SLIDE
+
+# How does it **really** work?
+
+
+!SLIDE
+
+# Every time you "commit" the current state of your website is recorded by the kittens
+
+
+!SLIDE images
+
+# After committing five times, your folder looks like this
+
+![Reality](images/reality.png "Reality diagram")
+
+
+!SLIDE
+
+# Now you can say:
+
+ 
+
+# "Kittens, I was foolish! Please restore my code to how it looked when I last committed!"
+
+
+!SLIDE images
+
+# The kittens will then restore your code
+
+![Restore latest](images/restore-latest.png "Restore latest diagram")
+
+!SLIDE
+
+# Of course, you could also say:
+
+ 
+
+# "Kittens, please restore my code to version 2!"
+
+![Restore v2](images/restore-2.png "Restore v2 diagram")
+
+
+!SLIDE
+
+# You can use version control to restore **any** committed version.
+
+
+!SLIDE
+
+# Credits
+
+* <http://www.flickr.com/photos/danielfoster/2829251197/>
+
+
+
+
+
+
+