Code

Three way merge#134

Code

Open

likelion wants to merge 5 commits intoterminusdb:mainterminusdb/terminusdb-store:mainfrom likelion:three_way_mergelikelion/terminusdb-store:three_way_mergeCopy head branch name to clipboard

+116

Commits

Commits on May 17, 2023

• placeholder for apply_merge

  likelion

  committed
  b002c2f

  Copy full SHA for b002c2f

• implemented 3-way-merge

  likelion

  committed
  b8d35e5

  Copy full SHA for b8d35e5

• made merge base optional

  likelion

  committed
  25e19ab

  Copy full SHA for 25e19ab

Commits on May 31, 2023

• added apply_merge test

  likelion

  committed
  fa39ca1

  Copy full SHA for fa39ca1

Commits on Jul 18, 2023

• Merge branch 'main' into three_way_merge

  GavinMendelGleason

  authored
  446274f

  Copy full SHA for 446274f