Database branching: three-way merge for schema changes…

LINK