Can I work on multiple branches of the same database?

gmchenry · June 15, 2018 1:33AM

When linking to a database using the dedicated development model, how can you switch between branches? I'm working on two different enhancements with a separate branch for each. I tried unlinking Enhancement Branch 1 and relinking to the database, selecting Enhancement Branch 2. However, Enhancement Branch 2 contained the enhancements I thought were exclusive to enhancement branch1. What am I doing wrong?

AlexYates · June 15, 2018 5:55AM

What VCS are you using? Git? TFVC? etc.

gmchenry · June 15, 2018 1:15PM

I'm using TFS.

AlexYates · June 15, 2018 4:28PM

In this scenario your database will not change simply by switching branches. The changes might appear as a conflict in the get latest tab? If not try using SQL Compare after you switch branches to force your local dev DB to sync up with the appropriate branch.

If you try that and you still get issues my guess is it's a bug - but try it first.

In general my advice is that wherever possible you to maintain a separate database for each branch. If branching is something you do regularly this will force you to get better at provisioning, which will have many nice consequences.

David Atkinson · June 15, 2018 4:57PM

The workaround that I've heard works is after the branch has changed, to unlink and relink the project. This will force the tool to interpret any changes as conflicts. Then it's just a question of choosing the "Source Control" changes as "winning" the conflict and applying these changes to the database.

Can I work on multiple branches of the same database?

Answers

Product Learning

Community Forums

Events & Friends

Simple Talk