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

add a drop_conflicts strategy for merging attrs #4827

Merged
merged 25 commits into from
Feb 10, 2021

Merge branch 'master' into keep_attrs-drop_conflicts

4a4faa5
Select commit
Loading
Failed to load commit list.
Merged

add a drop_conflicts strategy for merging attrs #4827

Merge branch 'master' into keep_attrs-drop_conflicts
4a4faa5
Select commit
Loading
Failed to load commit list.

Workflow runs completed with no jobs