From: W. Trevor King <wking@tremily.us>
Date: Wed, 23 Oct 2013 04:15:03 +0000 (-0700)
Subject: version-control/instructor.md: Add a 'Tool choices' section
X-Git-Url: http://git.tremily.us/?p=swc-version-control.git;a=commitdiff_plain;h=51697b22706a9f87d69fa2422318dbe37723a7b9

version-control/instructor.md: Add a 'Tool choices' section

Software Carpentry is about how to develop software, which is largely
independent of the tooling for a particular task.  This branch only
contains the generic motivation and introduction for version control.
That's nice, but a particular Software Carpentry course or boot camp
*is* going to want to teach a specific tool, and we want instructors
to easily be able to find and integrate notes for the tool they
choose.

This setup doesn't assume that there is a single canonical set of
notes for a given tool.  If you don't like the branches I've listed,
write up your own.  If you tell me about it, I'll add a link to your
branch as well, and we can try and work up some short descriptions to
help new instructors differentiate between the two approaches.

The choices are in the format used by `git request-pull`, so you can
run:

  $ git merge $CHOICE

to merge the branch.  For example:

  $ git merge git://github.com/wking/swc-boot-camps.git version-control-git

without bothering to setup remotes, etc.
---

diff --git a/version-control/instructor.md b/version-control/instructor.md
index 78f16f0..6dd826c 100644
--- a/version-control/instructor.md
+++ b/version-control/instructor.md
@@ -6,8 +6,24 @@ changes upstream and why that's a good way to structure development.
 Provided there aren't network problems, this entire lesson can be
 covered in 90 minutes.
 
+Tool choices
+============
+
+There are many version control tools available, and we have Software
+Carpentry branches for some of them.  Possible choices:
+
+Git
+---
+
+* `git://github.com/wking/swc-boot-camps.git version-control-git`
+
+Subversion
+----------
+
+* `git://github.com/wking/swc-boot-camps.git version-control-svn`
+
 Teaching notes
---------------
+==============
 
 * Make sure the network is working *before* starting this lesson.