We are having a problem with the TFS connection. Is there any way to do merges between branchs with the TFS down?
+2
A:
I don't think so since TFS merges items by comparing the items from the source/target branch which at least one would be on the server.
bechbd
2010-01-25 15:28:13
Correct, TFS merge is computed by the server using merge history.
Richard Berg
2010-01-25 17:18:25
+1
A:
It would make no sense to do so. If your TFS is offline, you cannot know whether you would merge the newest source code state. This would be highly insecure since it leads to code missmatch.
If you want to merge some code offline, do it manually with tools like WinMerge and update it to your TFS when its online again ;)
Marcus
2010-01-25 15:37:24