KW_NSM #26
Merged
KW_NSM #26
Conversation
This file contains hidden or 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
Added nitrogen test cases
Updated GSM to match NSM (kept old files as _old). Added unit test cases for GSM.
Completed CBOD and CBOD Unit Test modules.
Updated Alkalinity and added pH calculation. Started set up for test cases.
Unit tests for Alkalinity
Member
|
@kewalak, I just did a quick glance, and it looks like the merge conflicts are related to formatting and whitespace. If so, these should be relatively easy to resolve once you know the mechanics of resolving merge conflicts. I like to do it using by trigger a merge with GitHub Desktop and using it's prompts to resolved the merge conflicts in Visual Studio Code. I would be more than happy to walk you through that process on a Zoom call today. @xaviernogueira, did you make formatting edits to NSM files? |
Contributor
|
@aufdenkampe maybe accidentally via autopep8, nothing important they can be discarded |
Contributor
Author
|
@aufdenkampe A walk through would be very helpful. I am available anytime this morning for a call! |
Member
|
@kewalak, awesome! Thanks for merging these into |
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.
I did not merge this branch into main for a while. I think the files that I edited were not changed by anyone else just restructured?
I will see if I can merge them in but might need some help.