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 status code return on revert merge without parent #4498

Merged
merged 1 commit into from
Oct 30, 2022
Merged

Fix status code return on revert merge without parent #4498

merged 1 commit into from
Oct 30, 2022

Conversation

nopcoder
Copy link
Contributor

Fix #4041

@nopcoder nopcoder self-assigned this Oct 28, 2022
@nopcoder nopcoder added area/API Improvements or additions to the API include-changelog PR description should be included in next release changelog labels Oct 28, 2022
@nopcoder nopcoder requested a review from a team October 30, 2022 07:40
N-o-Z
N-o-Z approved these changes Oct 30, 2022
View reviewed changes
Copy link
Member

@N-o-Z N-o-Z left a comment

Choose a reason for hiding this comment

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

LGTM!

@nopcoder nopcoder merged commit 9b35905 into master Oct 30, 2022
@nopcoder nopcoder deleted the fix/revert-merge-conflict branch October 30, 2022 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@N-o-Z N-o-Z N-o-Z approved these changes

Assignees

@nopcoder nopcoder

Labels
area/API Improvements or additions to the API include-changelog PR description should be included in next release changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

lakectl branch revert returns 500 for merge commit revertion
2 participants
@nopcoder @N-o-Z