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

Ensure that MERGE() works properly with fast forward. #1101

Merged
merged 2 commits into from Dec 14, 2020
Merged

Ensure that MERGE() works properly with fast forward. #1101

merged 2 commits into from Dec 14, 2020

Conversation

VinaiRachakonda
Copy link
Contributor

Added test case as well.

@VinaiRachakonda VinaiRachakonda requested review from bheni and removed request for bheni December 9, 2020 23:16
bheni
bheni approved these changes Dec 14, 2020
View reviewed changes
Copy link
Contributor

@bheni bheni left a comment

Choose a reason for hiding this comment

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

lgtm

@VinaiRachakonda VinaiRachakonda merged commit bde72c7 into master Dec 14, 2020
@VinaiRachakonda VinaiRachakonda deleted the vinai/fix-merge-ff-commit branch December 14, 2020 22:02
@VinaiRachakonda VinaiRachakonda linked an issue Dec 15, 2020 that may be closed by this pull request
MERGE() is creating a new commit on FFs. #1099
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bheni bheni bheni 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.

MERGE() is creating a new commit on FFs.
2 participants
@VinaiRachakonda @bheni