[FB] Launch ancils: reset mergebase to commit 738093f #3733
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
* _regrid_area_weighted_array: Tweak variable order to near other use in code (#3571) * Fix problems with export and echo command. (#3577) * Pushdocs fix2 (#3580) * Revert to single-line command for doctr invocation. * Added script comment, partly to force Github respin. * Added whatsnew for Black. (#3581) * Fixes required due to the release of iris-grib v0.15.0 (#3582) * Fix python-eccodes pin in travis (#3593) * Netcdf load of ancillary vars: first working.
* Whatsnews relating to ancillary load + save.
* change dependencies : NOTE these changes need removing when remerging to master
Member
|
Awesome work @abooton -- Problem fixed ! 💐 We should now replace the existing 'launch_ancils' branch with this + rebase outstanding PRs to that. |
Contributor
Author
|
I checked that all the original commit shas were preserved correctly (because @pp-mo merged the using the "Create a merge commit" strategy). Therefore I have replaced the "launch_ancils" branch with "launch_ancils_mergebase738093f". (By first deleting "launch_ancils" in Github (to catch opern PRs), then: |
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.
The initial commit, #3556, made to the "launch_ancils" feature branch was created from a later point in master (738093f) than the launch_ancils feature branch (merge-base 9ec3913). As such, the feature branch includes changes from 6 commits already on master (see here.)
Therefore we have created a new feature branch "launch_ancils_mergebase738093f" that only includes the desired ancillary changes.
This was created by starting from merge-base 738093f and merging in the launch_ancils feature branch.
(Note - It was confirmed that is equivalent to rebasing launch_ancils. However, Github tracks the changes in clearer manner, hence this method is preferable.)