You reminded me that I need to get that book off my wishlist and onto my bookshelf! Perhaps there will be a copy at YAPC... I've only read good things about what they have to say. I recently read their new version control book, and it's a good introduction to the concepts behind version control, branching, etc. Not quite a meaty as I had hoped about branching & merging, but adequate nonetheless.