This morning I spotted a great question from one of our external Rangers and the answer by Pei.
- Does the current TFS2010 Version Control adapter support baseless merges?
Does the Adapter handle baseless merges implicitly or do I have to mark a merge action as baseless merge?
- The current TFS2010 adapter supports baseless merge.
- The adapter handle baseless merges implicitly. TFS2010 adapter will try merge first, when it gets a NoMergeRelationshipException, the adapter will then try to do a baseless merge.
I did some digging and here is the relevant code in the TFS VC Adapter, as mentioned above:
… so many features hidden within the platform :)