You can merge branches in dbForge Studio for SQL Server using one of the following tools:
Tip
Use this method for complex merges or when resolving conflicts, such as when the same object has been modified in both branches.
To merge branches using your version control system:
1. Use your source control tool to merge the changes from your feature branch into the main branch.
2. Resolve any conflicts as required.
3. Verify that all database object dependencies remain valid after the merge.
4. In dbForge Studio, refresh Source Control Manager to view the updated changes.
To merge changes using dbForge Studio:
1. In Database Explorer, link the database to the feature branch.
2. Click Get Latest to update the local database, and commit any pending changes.
3. Unlink the database from the feature branch.
4. Re-link the same database to the main branch.
5. In Database Explorer, right-click the database and click Source Control > Commit.
After the refresh completes, Source Control Manager displays the pending changes.
6. If conflicts are detected, choose how to resolve them:
7. Click Commit.
The Commit window opens and shows the stages of the commit operation.
8. To close the window, click OK.
Use Schema Compare to merge branches when there are no conflicts:
1. In Database Explorer, link the database to the main branch.
2. Use your version control system to create a local copy of your feature branch.
3. On the top menu, select Comparison > New Schema Comparison.
4. Set the local copy of your branch as Source.
5. Set the database linked to the main branch as Target.
6. Run the comparison, review the differences, and deploy them from Source to Target.
For instructions, see Synchronize schemas.
7. In Database Explorer, right-click a linked database you want to update and select Source Control > Commit.
8. In Source Control Manager that opens, click Commit.
The Commit window opens and shows the stages of the commit operation.
9. To close the window, click OK.