Dev json hot fix#1070
Conversation
|
Thanks for this fix @msupernaw but you opened a PR to main using a feature branch off of dev. This seems like it is a true hot fix and thus your branch needs to be rebased to main and force pushed. |
|
@kellijohnson-NOAA I meant to create the PR to dev. |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1070 +/- ##
==========================================
- Coverage 85.97% 85.96% -0.01%
==========================================
Files 81 81
Lines 7884 7887 +3
Branches 515 517 +2
==========================================
+ Hits 6778 6780 +2
- Misses 1098 1099 +1
Partials 8 8 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
But the PR should be to main because it fixes version 0.7.0. So, the DESCRIPTION file should also be edited to be 0.7.1 because it is a hot fix and not a new version. If it goes into dev first then it will be part of version 0.8.0. Also, the spell check file needs to be updated. |
|
This PR needs to be rebased to main because it was originally based off of a feature branch off of dev. |
|
@kellijohnson-NOAA rebased to main yesterday. I just verified the SHAs are the same, let me know if there are issues. |
|
Thanks @msupernaw I didn't realize that because you made a feature branch off of dev and dev has the exact same history as main that it won't allow the removal of those two commits (see below) with a straight rebase. You need to do an interactive rebase and remove those commits. Let me know if you need help doing that. Gemini can also provide directions Gemini instructions Step 2: Drop the Unwanted Commits Locate the two commits from dev that you want to remove. Change the word pick to drop (or just d) next to those commits Leave your actual feature commits as pick. Step 3: Save and Exit Git will now rewrite your branch history, removing the "dropped" commits and keeping only your feature work. Step 4: Force Push (Note: --force-with-lease is safer than --force because it checks that no one else has pushed code to that branch in the meantime.) |
0a1c53d to
8bc01bf
Compare
Thanks to @MOshima-PIFSC for finding the bug and @msupernaw for fixing it. Adds a sanitization function to fix the output formatting from model estimation in rcpp_models.hpp rcpp_interface_base.hpp Close #1063
8bc01bf to
0d7f735
Compare

What is the feature?
How have you implemented the solution?
Does the PR impact any other area of the project, maybe another repo?