forked from Netflix/metaflow
-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conflict resolution of upstream merge 2.5.1 #159
Closed
cloudw
wants to merge
13
commits into
merge_upstream_2_5_1
from
merge_upstream_2_5_1_conflict_resolution
Closed
Conflict resolution of upstream merge 2.5.1 #159
cloudw
wants to merge
13
commits into
merge_upstream_2_5_1
from
merge_upstream_2_5_1_conflict_resolution
Conversation
This file contains 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
WARNING: Coverage removed. User scenario broken.
alexlatchford
approved these changes
Feb 28, 2022
I'd say we get the tests working before merging this, looks like there are still some |
talebzeghmi
reviewed
Feb 28, 2022
Closing in favor of merge_upstream_2_5_3 branch |
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.
Resolving conflicts from upstream.
Most of conflicts are result of netflix/metaflow embracing black formatting 🎉
Major changes that resulted in code changes: