Return error codes for merge failures #8191
Labels
documentation
Improvements or additions to documentation
enhancement
New feature or request
merge
Issues relating to merge
Sometimes when merges fail, there's more context / nuance than can reasonably be displayed in an error message.
The motivating example here is a case where a branch contains changes to the primary key schema. In these cases, we can't merge, and we instruct the user to manually make the table identical on both branches. If the user does this, then we can skip merging that table.
So when we hit this failure state, the user could be trying to do a couple different things:
Conveying all of the necessary context and information to address all of these possible situations would make the error message unwieldy. But if Dolt returned a succinct message and an error code, we could have a section in the documentation that describes the error codes in more detail and proposes remedies.
The text was updated successfully, but these errors were encountered: