The guys over Vertigo Software’s Team System blog have also posted up about branching looking at some of the practical aspects of creating branches and performing merges – with conflict resolution! Worth checking out if you haven’t see this done before.