Commits

Steve Losh  committed 07db75f

Start working on the Use Version Control slides.

  • Participants
  • Parent commits a461ac6

Comments (0)

Files changed (7)

 syntax: glob
 
 .DS_Store
+*.html

File use-version-control/images/my-site-staggered.png

Added
New image

File use-version-control/images/my-site.png

Added
New image

File use-version-control/images/not-version-control-at-all.png

Added
New image

File use-version-control/images/oh-hells-no.png

Added
New image

File use-version-control/style.stylesheets

+body {
+    background-color: #eee;
+    text-shadow: 0px 1px 0px #fff;
+}
+h1, h2, h3, h4, h5, h6 {
+    text-shadow: 0px 2px 0px #fff;
+    font-weight: normal;
+}
+h1 {
+    font-size: 1.875em;
+}
+
+
+a:link, a:active, a:visited {
+    color: #e51b52;
+    text-decoration: none;
+}
+a:hover {
+    border-bottom: 2px solid #e51b52;
+}
+h1 a:hover, h2 a:hover {
+    border-bottom: 4px solid #e51b52;
+}
+h3 a:hover, h4 a:hover {
+    border-bottom: 3px solid #e51b52;
+}
+
+pre {
+    font-family: Menlo, Monaco, "Courier New", Courier, monospace;
+}
+
+div.images {
+    text-align: center;
+}
+img {
+    padding: 2px;
+    background-color: black;
+    border: 10px solid #ccc;
+    margin: 0.75em auto;
+    display: block;
+}
+
+ol {
+    margin-top: 1em;
+    list-style-type: decimal;
+}
+ol li {
+    list-style-type: decimal;
+    margin-left: 1.5em;
+}
+
+div#slides div .content strong {
+    text-decoration: none;
+}

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

+!SLIDE
+
+# Using Version Control Will Make You Happy
+
+
+!SLIDE
+
+# Hi, I'm [Steve Losh][]
+
+[Steve Losh]: http://stevelosh.com/
+
+
+!SLIDE
+
+# Senior Software Engineer at
+# [Dumbwaiter Design][]
+
+[Dumbwaiter Design]: http://dwaiter.com/
+
+
+!SLIDE
+
+# We Need to Talk
+
+
+!SLIDE
+
+# You've probably heard about version control
+
+
+!SLIDE images
+
+# This is not version control
+
+![Not Version Control, Not Even a Little Bit](images/not-version-control-at-all.png "Awful Version Control")
+
+
+!SLIDE
+
+# This is version control:
+# [Mercurial][]
+
+ 
+
+# And so is this:
+# [Git][]
+
+[Mercurial]: http://hg-scm.org/
+[git]: http://git-scm.com/
+
+
+!SLIDE
+
+# Why should you care?
+
+
+!SLIDE images
+
+# Let's look at an example. Here's my website:
+
+![stevelosh.com](images/my-site.png "Screenshot of my website")
+
+
+!SLIDE
+
+# Wouldn't it be sweet if I staggered the navigation?
+
+
+!SLIDE
+
+# … code for 30 minutes …
+
+
+!SLIDE images
+
+# Hmm, I'm not sure about this
+
+![stevelosh.com staggered](images/my-site-staggered.png "Screenshot of my website with staggered navigation")
+
+# Wait a second…
+
+
+!SLIDE images
+
+# Oh god what was I thinking?
+
+![stevelosh.com staggered blog](images/oh-hells-no.png "Screenshot of my website's blog with staggered navigation")
+
+# Kill it with fire!
+
+
+!SLIDE
+
+# How do you go back to the good version?
+
+
+!SLIDE
+
+# Without version control:
+
+1. Pour a glass of whiskey
+2. Code for 30 more minutes
+
+
+!SLIDE
+
+# With version control:
+
+1. `hg update --clean`
+
+
+!SLIDE
+
+# Version control just saved you:
+
+1. 30 minutes
+2. A glass of whiskey
+
+
+!SLIDE
+
+# Whiskey is expensive, so let's all use version control, okay?
+
+
+!SLIDE
+
+# So what **is** version control?
+
+
+!SLIDE
+
+# It's a way to keep track of versions of things you work on
+
+
+!SLIDE
+
+# Sorry, that was a useless answer
+
+
+!SLIDE
+
+# You're working on a website
+
+ 
+
+# You want to "check in" your code as you work
+
+
+!SLIDE
+
+# This gives you a record of your changes
+
+ 
+
+# It also lets you blow away bad ideas easily
+
+
+!SLIDE
+
+# So how does it work?
+
+
+!SLIDE images
+
+# You've got a folder containing with your website
+
+![alt text](/url/of/img.jpg "Title")
+
+
+!SLIDE
+
+# Now add another folder inside it, containing magic kittens
+
+![alt text](/url/of/img.jpg "Title")
+
+
+
+
+
+
+
+!SLIDE code
+
+@@@ python
+    def foo
+      :bar
+    end
+@@@
+
+
+!SLIDE
+
+Google is [here](http://google.com)
+
+
+!SLIDE
+
+# Questions?