Recombine version control and branching.