Merge branches

dbForge Studio for SQL Server allows merging branches.

Merge branches via the Source Control tool

1. In Database Explorer, link the database to the required branch in your repo folder.

2. Get the latest version and commit the changes if any.

3. Unlink the database from your branch.

4. Re-link the database to the main branch.

5. In Database Explorer, right-click the linked database you want to update and select Source Control > Commit.

6. Wait until the refresh operation is complete, and Source Control Manager opens, showing the stages of the operation.

7. If there are conflicts, select the required way to resolve the conflict:

• Get Local - your version of the object/data will be committed to the source control
• Get Remote - your changes will be discarded; your local database will be updated with the latest version of the object/data from the source control

8. Click Commit. The Commit window opens, showing the stages of the commit operation. When all the stages are done, click OK to close the window.