Skip to content
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

Conversation

cloudw
Copy link
Collaborator

@cloudw cloudw commented Feb 28, 2022

Resolving conflicts from upstream.

Most of conflicts are result of netflix/metaflow embracing black formatting 🎉

Major changes that resulted in code changes:

@cloudw cloudw self-assigned this Feb 28, 2022
@alexlatchford
Copy link

I'd say we get the tests working before merging this, looks like there are still some <<< lines in there based on the test details :)

@cloudw
Copy link
Collaborator Author

cloudw commented Mar 28, 2022

Closing in favor of merge_upstream_2_5_3 branch

@cloudw cloudw closed this Mar 28, 2022
@cloudw cloudw deleted the merge_upstream_2_5_1_conflict_resolution branch April 5, 2022 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants