Resolve merge conflict for v5.1.1-rc #2964
Merged
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
Updates the requirements on [netcdf4](https://github.com/Unidata/netcdf4-python) to permit the latest version. - [Release notes](https://github.com/Unidata/netcdf4-python/releases) - [Changelog](https://github.com/Unidata/netcdf4-python/blob/master/Changelog) - [Commits](Unidata/netcdf4-python@v1.6.1...v1.7.1.post2) --- updated-dependencies: - dependency-name: netcdf4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…ox-eq-1.7.1 Update netcdf4 requirement from ~=1.6.0 to ~=1.7.1
Member
|
Yes that's right, although the PR is empty? I guess we'll see if Github works out that this fixes the conflict? |
ZedThree
approved these changes
Aug 21, 2024
Contributor
Author
|
Yes, I think the correct version was already in the rc, so we only need to make sure git is aware that this is the correct version 👍 |
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.
@ZedThree Is merging master into the RC the correct way to resolve the conflict?