The thing worth discussing is the merge semantics, which are not quite the same as it does not imagine an automated setting, Dolt.merge takes a branch, a message, and tries to merge to the current branch:
fast-forward merges work as expected, message discarded
conflict-free merges create a commit with all updated tables
merges with conflicts are aborted
database must be "clean" to merge
Open to discussion on a better approach, but this seemed like the most tenable strategy for something that makes sense in an automated setting.
This pull request addresses the following:
70 implement merge
98 now parses merge commits correctly
97 change type
The thing worth discussing is the merge semantics, which are not quite the same as it does not imagine an automated setting,
Dolt.mergetakes a branch, a message, and tries to merge to the current branch:Open to discussion on a better approach, but this seemed like the most tenable strategy for something that makes sense in an automated setting.