Hi Theo, I am afraid that you haven't been working with the git subtree feature? So now all changes you have done on Friday are only applied on the RangeShifter_resturct repository, but not on the RScore repository. The idea was, that we use the git subtree feature for the RScore subdirectory and push changes to the RScore repository (using git subtree push) as well as to the RangeShifter_restruct (or RangeShiftR_restruct) repository. In that way both the batch version as well as the R package can access changes/commits/etc. To setup the git subtree, you need to checkout the branch, delete the RScore subdirectory and add it again as a subtree (which will checkout the given branch of the RScore repository into the RScore subdirectory. I have provided instructions in the word document (and I thought also in the ppt?). I know that this step might by a bit annoying, but I haven't found a better solution, so both batch and R package would link to the same RScore files/repository. (But if you know a better solution, I am happy to discuss it.)
Best, Jette
Hi Theo, I am afraid that you haven't been working with the git subtree feature? So now all changes you have done on Friday are only applied on the RangeShifter_resturct repository, but not on the RScore repository. The idea was, that we use the git subtree feature for the RScore subdirectory and push changes to the RScore repository (using
git subtree push
) as well as to the RangeShifter_restruct (or RangeShiftR_restruct) repository. In that way both the batch version as well as the R package can access changes/commits/etc. To setup the git subtree, you need to checkout the branch, delete the RScore subdirectory and add it again as a subtree (which will checkout the given branch of the RScore repository into the RScore subdirectory. I have provided instructions in the word document (and I thought also in the ppt?). I know that this step might by a bit annoying, but I haven't found a better solution, so both batch and R package would link to the same RScore files/repository. (But if you know a better solution, I am happy to discuss it.) Best, Jette