Commits

Frederic De Groef committed 6d03e7d

elements of style

Comments (0)

Files changed (5)

intro/01_slide.md

 ## *"[...] is the management of changes to documents, programs, and other information stored as computer files."*
 
 
-
 !SLIDE bullets incremental
 
 # For every modification, a VCS should anwer to :
 * Who ?
 
 
+
 !SLIDE bullets incremental
 
 # To be useful, a good VCS should also :

mercurial/01_dvcs.md

 ![](Unicorn.jpeg)
 
 
+
 !SLIDE bullets incremental small
 
 # A brief history 
 * Distributed systems : **mercurial (hg)**, git, bazaar
 
 
+
 !SLIDE bullets incremental small
 
 # What it will do for you:
 * help resolve them
 
 
+
 !SLIDE bullets incremental small
 
 # Distributed Version Control Systems
 * which is a big deal, actually
 
 
+
 !SLIDE bullets incremental small
 
 # DVCS : P2P architecture
 * free backup for every team member
 * no restriction on the collaboration strategy
 * which is a big deal, actually
-

mercurial/02_hg.md

 * most operations are easy
 
 
+
 !SLIDE
 
 # Let's dive in!

versionning/01_why.md

-
 !SLIDE transition=turnUp
 
 # Why would I do that ? #
 ## All that programming and stuff
 
 
+
 !SLIDE
 
 # I feel your pain
 
+
+
 !SLIDE
 
 # Only 24 hours in a day

versionning/02_scenario.md

 ## Bad patterns in non-revisionned code
 
 
+
 !SLIDE 
 
 # Start a new project,
             sum += a_list[i]
         return sum
 
+
+
 !SLIDE
+
 # Try out a new approach, comment out the old version
 
     @@@ python
         return sum
 
 
+
 !SLIDE
 
 # Oh wait, cool new idea
 ## The poor readability should strike you
 
 
+
 !SLIDE transition=scrollLeft
 
 # Pop Quizz
 
+
+
 !SLIDE small
 
 # What does this program do ?
         print i
         sleep(1)
 
+
     
 !SLIDE  transition=scrollRight
 
 ## Don't undermine this
 
 
+
 !SLIDE smaller 
 
 # Code hoarding
 ## But do you really want to maintain 3 versions of the same function? 
 
 
+
 !SLIDE
 
 # This is not good
 
 
+
 !SLIDE bullets incremental
 
 # Now, for the bad part
 * What if you **need** to go back to an older, working version?
-* Also, debugging
+* Also, creating experiments for debugging
 
 
 
 # Reverting commented parts one by one!
 
 * This will be very error prone
-* and unproductive.
+* Not to mention, unproductive.
 * You will probably make a mistake
 
 
 
 
 
+
 !SLIDE transition=toss
 
 # Enters collaborative work
 
-!SLIDE center transition=slideY
+
+
+!SLIDE center 
 
 ![Yay, collaboration!](mice_shadow.png)
 
 
+
 !SLIDE bullets incremental
 
-
 # Sharing changes with your team ?
 
 * USB Flashdrive !
 # Handling concurrent changes ?
 ## Careful line by line review
 
-
 ![](files_shadow.png)
 
+## Again, you will make mistakes
 
-## Again, you will make mistakes
+
 
 !SLIDE
 
 ## Keypoint:
-# Highlighting and resolving differences in text files is easy to do for a computer 
-## Let it do the work 
+# Detecting and resolving differences in text files is easy to do for a computer 
+## Let it do the work