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

Jump to bottom

dolt conflicts needs some user interface work #2037

Open
timsehn opened this issue Aug 19, 2021 · 0 comments
Open

dolt conflicts needs some user interface work #2037

timsehn opened this issue Aug 19, 2021 · 0 comments
Labels
good first issue

Comments

@timsehn
Copy link
Sponsor Contributor

@timsehn timsehn commented Aug 19, 2021

Skipped bats test here: #2035

  1. dolt conflicts cat on a table with no conflicts should return empty
  2. Running SQL on an active merge where conflicts are resolved with --ours or --theirs should not throw conflict warnings.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
1 participant
@timsehn