dbForge Studio for MySQL allows merging branches.
1. In Database Explorer, link the database to the required branch in your repo folder.
2. Get the latest version and commit your changes, if any.
3. Unlink the database from your branch.
4. Relink the database to the main branch.
5. In Database Explorer, right-click a linked database you need to update and select Source Control > Commit.
6. Wait until the refresh operation is complete and the Source Control Manager opens, showing the stages of the operation.
7. If there are conflicts, select the required way to resolve the conflict:
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.