MergeTool

Description

Merge tool let you overview and selectively apply changes from one database to another.

How to use

  • Select Merge tool tab
  • Choose both databases. For simplicity sake, you always apply changes from database #2 to database #1
  • Review the changes. In detailed view you can see every single change
  • Apply the changes you want to apply and save database # 1

Using MergeTool in multi-user environment

If you have more than one developer, who can edit database values in your project, you can use MergeTool to resolve conflicts.

Once you noticed database file was changed in your source control system (Git/Perforce/etc.), do the following:

  • Copy your local database to some folder outside of your project
  • Resolve the conflict by replacing your local database with the file from source control system
  • Open MergeTool and for database#2 field uncheck "Use saved default database" and select previously saved file from Step 1
  • Review your changes and apply them
  • Please, note, in some cases, you need to discuss the changes with your colleague to avoid erasing his changes (this could happen if you changed the same row and field). Alternatively, you can use Merge Tool to review the changes your colleague made.

Also, another option for multi-user environment setup is to use Google Sheets spreadsheet with lock sheet as primary source of data.