Commits

Steve Losh  committed 5cce76c

Finish up the last of the diagrams.

  • Participants
  • Parent commits 591a090

Comments (0)

Files changed (13)

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

Old
Old image
New
New image

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

Old
Old image
New
New image

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

Old
Old image
New
New image

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

Old
Old image
New
New image

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

Old
Old image
New
New image

File use-version-control/images/omg-merge.png

Added
New image

File use-version-control/images/pre-merge-1.png

Added
New image

File use-version-control/images/pre-merge-2.png

Added
New image

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

Added
New image

File use-version-control/images/time-machine.png

Old
Old image
New
New image

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

Old
Old image
New
New image

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

Old
Old image
New
New image

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

 # How?
 
 
-!SLIDE
+!SLIDE images
 
 # You make some changes to your book and "commit" those changes.
 
+![Your changes](images/pre-merge-1.png "Before Merge 1 Diagram")
 
-!SLIDE
+
+!SLIDE images
 
 # Meanwhile, your friend is doing the same thing.
 
+![Their changes](images/pre-merge-2.png "Before Merge 2 Diagram")
 
-!SLIDE
+
+!SLIDE images
 
 # You can "pull" your changes from their computer onto yours.
 
+![Pulled](images/pulled.png "Pulled Diagram")
 
-!SLIDE
+
+!SLIDE images
 
 # Now you can "merge" their changes with yours.
 
+![Merged](images/omg-merge.png "Merged Diagram")
+
 
 !SLIDE