Q: TFS Permanently Merging Two Files (how to track?) I have two files, A.cs and B.cs, next to each other in the same branch. I want to copy/paste B.cs into A.cs such that A.cs contains its original contents as well as the contents of B.cs.
In TFS, this means a delete operation on B.cs, and an edit operation on A.cs. However, we lose the revision history of B.cs. Is there a way to tell TFS that B.cs is now A.cs?
Is this a use case for a baseless merge?
tf merge /baseless B.cs A.cs


A: Yes, in this case you can pend a baseless merge with B.cs as the target and A.cs as the source, then pend a delete on B.cs.
In this case, you will then have the history for B.cs accessible when viewing the history for A.cs:

