search

treeverse / lakeFS

lakeFS - Data version control for your data lake | Git for data
https://docs.lakefs.io
Apache License 2.0
4.46k stars 359 forks source link

Fix: Pull Requests merge errors #8302

Closed N-o-Z closed 3 weeks ago

N-o-Z commented 4 weeks ago

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

github-actions[bot] commented 4 weeks ago

E2E Test Results - DynamoDB Local - Local Block Adapter

13 passed
github-actions[bot] commented 4 weeks ago

E2E Test Results - Quickstart

11 passed
N-o-Z commented 3 weeks ago

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

Added unit test