Branching and Merging: Ten Pretty-Good Practices