Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge. #6980

Merged
merged 39 commits into from
Nov 21, 2023