Database Project, Baseless Merge with SSDT & TFS

Question

How do we best perform a Baseless Merge between two branches of a TFS Database Project? We have a change in Branch B that we need to merge into branch A. Can we make a Schema Compare in VS and just update?

Answer 1

You do a baseless merge just like you would regardless of the type of files that are in your branch (it has nothing to do with the fact that you are using Database Projects, they are treated the same way as any other type of project - just a bunch of files in a branch).

In the Merge dialog it will list in the drop-downs the branches that have relationships, but you can always browse for another target branch to initiate a baseless merge.