Code

Fixes to Merging algorithm#54

Code

Open

padupr wants to merge 22 commits intovara-devse-sic/vara-feature:vara-devfrom f-mergingFixesse-sic/vara-feature:f-mergingFixesCopy head branch name to clipboard

+420-8

Commits

Commits on May 24, 2021

• Fixes to merging algorithm to compensate xml formats limitations

  Show description for 2a30dcc
  

  Pascal Dupré

  committed
  2a30dcc

• Fix

  

  Pascal Dupré

  committed
  d3edd74

• Fix

  

  Pascal Dupré

  committed
  b4ac257

• Workaround for getChildren, relationship copy for non strict fixed

  

  Pascal Dupré

  committed
  99f6130

Commits on Jun 1, 2021

• Stuff

  

  Pascal Dupré

  committed
  5d6a33e

Commits on Jun 8, 2021

• Eval version

  

  Pascal Dupré

  committed
  c17f473

Commits on Jun 10, 2021

• Merge branch 'vara-dev' into f-mergingFixes

  vulder

  authored
  096cefc

Commits on Jul 23, 2021

• Update include/vara/Feature/FeatureTreeNode.h

  Show description for 4c94e95
  

  vulder

  and

  github-actions[bot]

  authored
  4c94e95

• Merge branch 'vara-dev' into f-mergingFixes

  Show description for 0eba8f7
  

  Pascal Dupré

  committed
  0eba8f7

• Revert merge error

  

  Pascal Dupré

  committed
  eb6aabf

• Remove old testcase, reproduced in other tests

  

  Pascal Dupré

  committed
  5975b52

Commits on Jul 30, 2021

• Feedback

  

  Pascal Dupré

  committed
  1025d36

• Update unittests/Feature/FeatureModelTransaction.cpp

  Show description for 25a26e6
  

  padupr

  and

  vulder

  authored
  25a26e6

• Update unittests/Feature/FeatureModelTransaction.cpp

  Show description for 08c1ae5
  

  padupr

  and

  github-actions[bot]

  authored
  08c1ae5

Commits on Aug 28, 2021

• Feedback

  

  Pascal Dupré

  committed
  c4226e5

• Merge branch 'vara-dev' into f-mergingFixes

  vulder

  authored
  aed93e3

• Revert changes to bindings

  

  Pascal Dupré

  committed
  ee977c9

• Revert all changes to bindings

  

  Pascal Dupré

  committed
  f7e0e52

Commits on Jan 17, 2022

• Merge branch 'vara-dev' into f-mergingFixes

  vulder

  authored
  052c46f

• Fixes error

  vulder

  committed
  e0f211b

Commits on Feb 4, 2022

• Adds error

  vulder

  committed
  c4b01e5

Commits on Feb 6, 2022

• Merge branch 'vara-dev' into f-mergingFixes

  vulder

  authored
  df1f5ea