search

gl186 / SprintFinish

Sprint 2 and final assessment project for Group 1 (Module 3 PGCert Clinical Bioniformatics Intro to Programming)
The Unlicense
0 stars 1 forks source link

Team 2 #40

Closed LMP2005 closed 8 months ago

LMP2005 commented 8 months ago

Creation of test folder. To contain Functional test for main.py and unit test for each individual module

LMP2005 commented 8 months ago

Not sure what the conflicts are. I can't seem to find them on the command line. "Resolve conflicts" in the box above on the right isn't highlighted, which indicates that it isn't straightforward. I will look into again tomorrow.

LMP2005 commented 8 months ago

Ok I think the merge conflicts are a result of Christoph and myself both making changes to the same line of code in module2_variiabtvalidator.py in the same merge. We will have to break them down into different merges or only complete the final commits.

LMP2005 commented 8 months ago

Test modules should have no conflicts, as new folder.