Commits

Steve Losh  committed a4284e8

Finish most of the text.

  • Participants
  • Parent commits 3dc6497

Comments (0)

Files changed (1)

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

 # You can use version control to restore **any** committed version.
 
 
+!SLIDE
 
+# How else can version control help?
 
 
+!SLIDE
 
+# What if you're collaborating on a book with someone else?
 
 
+!SLIDE
 
+# You each have a copy of the book.
 
 
+!SLIDE
 
+# Your friend makes a change to chapter 2.
 
 
+!SLIDE
 
+# How do you get that change into your own copy?
 
+ 
 
+# Copy the entire file that holds chapter 2?
+
+
+!SLIDE omg
+
+# NO
+
+
+!SLIDE
+
+# What if you made your own changes to chapter 2?
+
+
+!SLIDE
+
+# Copying the file over would overwrite your changes.
+
+
+!SLIDE
+
+# You **could** ask them what they changed, and make those changes in your own copy by hand.
+
+
+!SLIDE
+
+# But that sucks.
+
+
+!SLIDE
+
+# It's 2010, we have computers now.
+
+
+!SLIDE
+
+# They can do this kind of work for us…
+
+
+!SLIDE
+
+# **If** you're both using version control.
+
+
+!SLIDE
+
+# How?
+
+
+!SLIDE
+
+# You make some changes to your book and "commit" those changes.
+
+
+!SLIDE
+
+# Meanwhile, your friend is doing the same thing.
+
+
+!SLIDE
+
+# You can "pull" your changes from their computer onto yours.
+
+
+!SLIDE
+
+# Now you can "merge" their changes with yours.
+
+
+!SLIDE
+
+# As long as you haven't both changed the same line, the computer can automatically combine their changes with yours.
+
+
+!SLIDE
+
+# Instead of spending 15 minutes with your friend figuring out what you both changed, you'll spend 10 seconds "merging."
+
+
+!SLIDE
+
+# We all have better things to do than trying to figure out what changes we made.
+
+
+!SLIDE
+
+# Let's all use version control to do the busywork for us.
+
+
+!SLIDE
+
+# I haven't talked about **how** to use version control.
+
+
+!SLIDE
+
+# Unfortunately we don't have enough time to do it right now.
+
+
+!SLIDE
+
+# There are two main version control systems that are popular right now.
+
+
+!SLIDE
+
+# [Mercurial](http://hg-scm.org/)
+
+ 
+
+## and
+
+ 
+
+# [Git](http://git-scm.com/)
+
+
+!SLIDE
+
+# It doesn't matter which one you use.
+
+
+!SLIDE
+
+# Try both.
+
+ 
+
+# Pick the one you prefer.
+
+
+!SLIDE
+
+# You'll probably find another one called "Subversion" or "SVN."
+
+
+!SLIDE
+
+# Don't use it.
+
+
+!SLIDE
+
+# Trust me.
+
+
+!SLIDE
+
+
+# Mercurial and Git are both far better.
+
+ 
+
+# Come talk to me if you want to know why.
 
 
 !SLIDE