add a drop_conflicts strategy for merging attrs#4827
Merged
dcherian merged 25 commits intopydata:masterfrom keewis:keep_attrs-drop_conflictsFeb 10, 2021
+247-29
Commits
Commits on Jan 19, 2021
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jan 23, 2021
- committed
- committed
- committed
- committed
- committed
- committed
- committed