Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

TFS 2012 Branching- Copy Dev as Main

I currently have a solution in TFS with only a Dev Folder:

/Dev

I would like to implement a branching strategy for this solution:

/Dev
/Main

I understand I can use the Convert to Branch feature, however how can I establish a relationship between the new parent (Main) branch and the existing child (Dev) branch?

I do not want to rename Dev to Main because I want to preserve the existing check-in history in the dev branch. Is there another way I can do this to establish the existing Dev branch as child and the new Main branch as parent, without having to rename Dev?

like image 775
Andrew Keller Avatar asked Jan 16 '13 01:01

Andrew Keller


Video Answer


1 Answers

If main doesn't exist yet then just take a branch from dev and call it Main. Once you've done this then you can reparent the branch so that dev is a child of main.

To do this select Dev in source control explorer and right click, then select "Branching and merging". Finally select "reparent" and use the UI to change the relationship with main.

If Main does exist then you will need to perform a baseless merge to establish the branch relationship

like image 156
James Reed Avatar answered Sep 28 '22 18:09

James Reed