Team Foundation Server merges without merging

Why doesn't TFS want to return old files to me?

Branch deployment enter image description here

Main section enter image description here

Combining Dev Home enter image description here

Edit: Given the first answer below and a few more studies, I believe I'm trying to rewrite the entire branch. Is it possible?

+5
source share
2 answers

This is good, I think that it would be best to restore files and folders in the main branch. To do this, go to "Tools", "Options". Expand "Source Control", select "Visual Studio Team Foundation Server" and check the box "Show deleted items in the source explorer"

enter image description here

"undelete", .

, dev , , TFS .

Visual Studio 2010

. cd c:\tfs\MyLocalWorkspace

"tf"

tf merge $/TeamProject/Dev $/TeamProject/Main /recursive /force

TFS , , . , , "undelete" , " ".

+3

( , " " ), , , . , Dev, .

, ?

+1

All Articles