Code

Merge top#249

Code

Open

fgrunewald wants to merge 12 commits intomastermarrink-lab/polyply_1.0:masterfrom merge_topmarrink-lab/polyply_1.0:merge_topCopy head branch name to clipboard

+278-5

Commits

Commits on May 5, 2022

• draft merge method

  

  Fabian Gruenewald

  authored and

  Fabian Gruenewald

  committed
  345ac51

  Copy full SHA for 345ac51

Commits on Jul 8, 2022

• merge method+tests

  fgrunewald

  committed
  353e815

  Copy full SHA for 353e815

Commits on Aug 3, 2022

• fix bugs in tests and merge top

  fgrunewald

  committed
  b50f138

  Copy full SHA for b50f138

• add test for merge error

  fgrunewald

  committed
  4094a64

  Copy full SHA for 4094a64

• bug fix when error is raised due to conficting types and test for it

  fgrunewald

  committed
  9acfa6a

  Copy full SHA for 9acfa6a

• add test for unsafe merge method

  fgrunewald

  committed
  51def84

  Copy full SHA for 51def84

Commits on Aug 17, 2022

• Update polyply/src/topology.py

  Show description for f2d6a29
  

  fgrunewald

  and

  pckroon

  authored
  f2d6a29

  Copy full SHA for f2d6a29

• Update polyply/src/topology.py

  Show description for a0ada0a
  

  fgrunewald

  and

  pckroon

  authored
  a0ada0a

  Copy full SHA for a0ada0a

• Update polyply/src/topology.py

  Show description for 9c39221
  

  fgrunewald

  and

  pckroon

  authored
  9c39221

  Copy full SHA for 9c39221

• Update polyply/src/topology.py

  Show description for 08c1f13
  

  fgrunewald

  and

  pckroon

  authored
  08c1f13

  Copy full SHA for 08c1f13

• Update polyply/src/topology.py

  Show description for f0e2f1f
  

  fgrunewald

  and

  pckroon

  authored
  f0e2f1f

  Copy full SHA for f0e2f1f

• Merge branch 'master' into merge_top

  fgrunewald

  authored
  c2b2130

  Copy full SHA for c2b2130