This data as json
| sha | message | author_date | committer_date | raw_author | raw_committer | repo | author | committer |
|---|---|---|---|---|---|---|---|---|
| f40d323c76f6cab9615567e4ba7afde7860f7775 | add 'no_conflicts' as compat option for merging non-conflicting data (#996) * Add notnull_equals method to Variable * add more tests for Variable.notnull_equals * add DataArray.notnull_equals * more tests for DataArray.notnull_equals * add Dataset.notnull_equals * remove redundant notnull_equivalent from utils * fix introduced flake8 errors * add 'notnull_equals' compat option to merge function and method * add wrong shape test to Variable.notnull_equals * refactor isnull * remove Dataset/Array `notnull_equals` methods * rename 'notnull_equals' --> 'no_conflicts' * update merge docstrings to include 'no_conflicts' * add docs on 'no_conflicts' * whats new entry * update dataset.merge docs and fix Raises ValueError -> MergeError * Update combining.rst Update combining.rst * DOC: We don't use None for missing values | 2016-09-15T16:07:16Z | 2016-09-15T16:07:16Z | c84d7f43d020d0bf3c5831ac2608854c10387a91 | f10b21bed2846b879806f87039b77245b18e7671 | 13221727 | 8982598 | 1217238 |