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.

Sign up for GitHub

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

Jump to bottom

Fix merge bug, add tests #858

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Fix merge bug, add tests #858

merged 2 commits into from
Oct 16, 2024

Conversation

tbantle22
Copy link
Contributor

Fixes #855

Dolt PR: dolthub/dolt#8459

@tbantle22 tbantle22 requested a review from zachmu October 16, 2024 20:11
zachmu
zachmu approved these changes Oct 16, 2024
View reviewed changes
Copy link
Member

@zachmu zachmu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions GitHub Actions
Copy link
Contributor

Main PR
Total 42090 42090
Successful 12728 12728
Failures 29362 29362
Partial Successes1 4897 4897
Main PR
Successful 30.2400% 30.2400%
Failures 69.7600% 69.7600%

Footnotes

  1. These are tests that we're marking as Successful, however they do not match the expected output in some way. This is due to small differences, such as different wording on the error messages, or the column names being incorrect while the data itself is correct. ↩

@tbantle22 tbantle22 merged commit f86e8e0 into main Oct 16, 2024
13 checks passed
@tbantle22 tbantle22 deleted the taylor/merge-bug branch October 16, 2024 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zachmu zachmu zachmu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

dolt_merge stomps working set
2 participants
@tbantle22 @zachmu