search

RangeShifter / RangeShifter_batch

RangeShifter batch version with new structure using subtree for RS core files
GNU General Public License v3.0
0 stars 0 forks source link

Update RScore to RScore/develop #23

Closed JetteReeg closed 8 months ago

JetteReeg commented 8 months ago

Hey Theo, I have realized that the src/RScore subdirectory in this repository was not up-to-date with the RScore/develop branch. To review the changes I created a new branch (RangeShifter_batch_dev/update-RScore-dev-tmp). I thought that only the changes for getting rid of the Version.h file were missing, but it seems, that there are actually some more inconsistencies? Plus it is again not able to pass the Git Action?

TheoPannetier commented 8 months ago

Ok, looking into it now!

TheoPannetier commented 8 months ago

Solved; the issue was that I had forgotten to also update and merge RS_batch_dev/unit_test into develop, sorry! Got a bit confused because its RScore counterpart is not ready to be merged into RScore/develop in its current state (but it has already been merged at an earlier state!)

JetteReeg commented 8 months ago

Great - so I guess we are now ready to merge all develop branches into main? and then I will also delete the branches we already merged in the R package repo (like cmake_batch, development_guidelines)