Checking possible Errors on dev to main merge #191
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
moved test data prep upwards so it only has to be run once (facilitates creation of variants of tests)
improve annotation
Merge branch 'dev' of https://github.com/ices-tools-dev/RDBEScore into dev # Conflicts: # man/createRDBESDataObject.Rd
added stratumName to search path related to #133 improved final values to be taken by some variables in new 0 rows related to #133 added a rule for value in SAnumTotal and SAnumSamp in new 0 rows (depends on unit sampled) #136 added an error message if assignment of SAcatchCat, SAsex, SAlandCat to new 0 rows is ambiguous #133
isolated a bit data prep to avoid having to repeat in every test added a test for #133 and a few other coded test to avoid ambiguity in assignment SAcatchCat OR SAsex OR SAlandCat in new 0 rows
closes Issue #133 # 136
|
so there is a |
small changes
|
I think because you specifically requested David review this he has to be the one to merge. At least it's not letting me do it... |
rix133
requested review from
nicholascarey
and removed request for
davidcurrie2001
Can you do it now? I changed the reviewer |
rix133
requested review from
nicholascarey and
davidcurrie2001
and removed request for
nicholascarey
nicholascarey
approved these changes
Nov 21, 2023
Yes. Merged! :) |
7 tasks
rix133
added a commit
that referenced
this pull request
Sep 19, 2024
Merge pull request #191 from ices-tools-dev/dev
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tring to get the latest developments into main