Expected Behavior

Bidirectional merge/synchronization

Does the current implementation support bidirectional merges/synchronization? If for instance, you store a local copy and a Dropbox copy separately (both available locally, though) and open the local copy and add a new entry, is there a way to merge the local copy's new entry into the Dropbox file (as well as pulling in any changes that are present in the Dropbox file but not yet the local copy, in either one or two steps)? I didn't see it anywhere in the menus and merge only seemed to affect the open database rather than both.

Asking due to the situation noted here http://keepass.info/help/kb/trigger_examples.html in the "Synchronizing with Dropbox..." section (sorry I can't link to that section specifically). At some point I had an issue with Dropbox overwriting with an older copy and dropping some of the changes (and adding a conflict file).

I saw a few issues that were related, but none seemed to address this directly. Apologies if this is a duplicate.

Final question, though it might belong in its own issue, is it possible for merges to assume both databases use the same password&/key and to only ask if the password&/key don't match?