HT
08/01/2023, 9:02 AMmain
, userA
branch out (branchA
). userB
branch out from the same commit on main
to branchB
.
Both user start modifying the delta Table in their own way.
userA
merge her branchA
to main
first: no issue, no conflict, nothing fancy.
Then userB
merge his branch branchB
to main
.
If lakefs is not aware of delta Table, you will have conflict on the table and need to choose which version from userA
or userB
to be the final copy.
From what understand, lakefs is aware of Delta Table, does it means that LakeFs can merge the delta table from userA
and userB
? So any new row in branchA and branchB will appear in main ?
How do you handle the case where the same row been modified by both users ??Itai Admi
08/01/2023, 9:36 AMdiff
between the 2 tables in the lakeFS UI, i.e. a real delta diff of the tables (e.g. 2 rows added in branchA
, a column was deleted in branchB
, etc.). Merging the branches is a different story as we’ll need to merge the delta log that was changed in both branches. It is on our roadmap and planned for Q4 this year.HT
08/01/2023, 9:42 AM