Version control

[Matthew Fernandez]

At work we've been overhauling a lot of our workflows and, at the same
time, ramping up the amount of concurrent development going on. One
thing that's become apparent is that version control is king. Our main
projects are in well-maintained repositories with mature hooks and
review tools. Not only does this enable more complex workflows, but it
also gives you a better picture of the history of a project and better
debugging facilities.

With this in mind, next month I want to try something a bit different
to the monthly tools email and take a deeper look at version control
tools and practices. First I've roped Billy into talking about Git
Flow. I was hoping other people would volunteer to share their
opinion/expertise about some things like the following:
- distributed vs centralised
- when to merge and when to rebase
- branching strategies
- working with upstream projects
- advanced techniques (I'm thinking patch queues, Quilt, Pbranches,
bridging tools like hg-svn, repairing corrupted repos, etc.)

Let me know if you've got information or a story you'd like to share -
or just email the list directly. This is a topic where I'm sure we all
have something to learn :)