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.
Avoid conflicts between the source's versions and anaconda's versions:
v1.1.0
in source but the main label isv1.1.1
in anaconda.v1.1.1
in source but the cnes label is alsov1.1.1
in anaconda.The v1.1.1 on the cnes branch do not modify the core library. One could then argue that creating a new build without modifying the version is a solution. However the fact that the main version on source and anaconda are desynced justify this PR imo.
History of the changes made that created the conflict: