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

MERGE() is creating a new commit on FFs. #1099

Closed
VinaiRachakonda opened this issue Dec 9, 2020 · 1 comment · Fixed by #1101
Closed

MERGE() is creating a new commit on FFs. #1099

VinaiRachakonda opened this issue Dec 9, 2020 · 1 comment · Fixed by #1101

Comments

@VinaiRachakonda
Copy link
Contributor

VinaiRachakonda commented Dec 9, 2020 •
edited

Looks like
if err == merge.ErrFastForward { return cmh.String(), nil }

is not doing anything since an ErrFastForward is never being returned anywhere.
@VinaiRachakonda VinaiRachakonda linked a pull request Dec 15, 2020 that will close this issue
Ensure that MERGE() works properly with fast forward. #1101
Merged
@VinaiRachakonda
Copy link
Contributor Author

Addressed in linked pr.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Ensure that MERGE() works properly with fast forward. dolthub/dolt
1 participant
@VinaiRachakonda