dolthub / dolthub/dolt

Report schema merge conflict for incompatible tables created on each branch

Open
#9,211 2 comments 0 reactions 0 assignees View on GitHub
customer issue merge
Dominant language
Go
Stars
24.4k
Forks
873
Avg merge
1d 5h
Merged PRs (30d)
108

Description

If a table is created on branch1 and branch2, but has a different schema, then merge currently aborts with the following error:
```
table with same name 'FOO' added in 2 commits can't be merged
```

This happens because there is no common ancestor commit in both branches that creates the table, so Dolt isn't sure which schema is the correct one to use. Instead of halting the merge with this error message, we should treat this as a schema merge conflict and report it through the standard schema merge conflict table. This would allow users to resolve the schema conflict in the same ways as other schema conflicts and would also enable all schema merge conflicts to be identified up front – instead of fixing one, retrying the merge, potentially hitting this error for another table, etc.

Contributor guide

No contributing guide indexed for this repository

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.