Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging develop into development-guidelines #21

Merged
merged 4 commits into from
Feb 5, 2024

Conversation

JetteReeg
Copy link
Collaborator

Before merging development-guidelines into develop, I wanted to merge the new changes of the develop branch into development_guidelines which includes:

  • changes of cmake_batch branch
  • bugfixes for cost layers in R package

@JetteReeg
Copy link
Collaborator Author

@TheoPannetier Am I missing some other changes? I thought that merging the changes of cmake_batch (now merged to develop) into development_guidelines should be fine? Why is it now complaining about the checks?

@TheoPannetier
Copy link
Member

@JetteReeg the RSrandom file was missing some includes for testing functions. I'm not sure why this hasn't been an issue earlier, but develop is fixed now!

@TheoPannetier TheoPannetier merged commit 7bbfdc1 into development-guidelines Feb 5, 2024
3 checks passed
TheoPannetier added a commit that referenced this pull request Feb 6, 2024
Merge pull request #21 from RangeShifter/develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants