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: Pull Requests merge errors #8302

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Fix: Pull Requests merge errors #8302

merged 4 commits into from
Oct 30, 2024

Conversation

N-o-Z
Copy link
Member

@N-o-Z N-o-Z commented Oct 23, 2024

Closes #8301

Change Description

Background

Merge error handling was taken from the lakeFS merge flow - where we returned an empty reference on conflict.
As result error was undefined

Bug Fix

Fixed to parse the given error and handle accordingly

Testing Details

Manually tested

@N-o-Z N-o-Z added bug Something isn't working include-changelog PR description should be included in next release changelog labels Oct 23, 2024
@N-o-Z N-o-Z requested review from itaigilo and a team October 23, 2024 16:23
@N-o-Z N-o-Z self-assigned this Oct 23, 2024
@github-actions GitHub Actions
Copy link

E2E Test Results - DynamoDB Local - Local Block Adapter

13 passed

@github-actions GitHub Actions
Copy link

E2E Test Results - Quickstart

11 passed

itaigilo
itaigilo approved these changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@itaigilo itaigilo left a comment

Choose a reason for hiding this comment

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

Looking good -
But why not to add a unit test for it?
(This function is already unit tested...)

@N-o-Z
Copy link
Member Author

N-o-Z commented Oct 28, 2024

Looking good - But why not to add a unit test for it? (This function is already unit tested...)

Added unit test

@N-o-Z N-o-Z enabled auto-merge (squash) October 28, 2024 17:02
@N-o-Z N-o-Z merged commit 042f3b5 into master Oct 30, 2024
38 checks passed
@N-o-Z N-o-Z deleted the fix/pull-request-errors-8301 branch October 30, 2024 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@itaigilo itaigilo itaigilo approved these changes

Assignees

@N-o-Z N-o-Z

Labels
bug Something isn't working 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.

BUG: Pull Requests merge conflict shows error 'undefined' in GUI
2 participants
@N-o-Z @itaigilo