I’ve been using git pretty heavily lately. The commands are a little wonky to learn, but once...
subversion
This blog entry by Ned Batchelder is basically the best article I’ve seen on branching and merging...
