Uh oh!
There was an error while loading. Please reload this page.
Enable keep attrs - #139
Conversation
…cept block for poorly defined reductions.
Conflicts: test/test_dataset.py
Conflicts: test/test_variable.py
shoyer
commented
May 21, 2014
The commit history here is getting a little messy. Could you make a commit which only adds the |
jhamman
commented
May 21, 2014
Agreed that this is messy and my apologies for trying to do too many things at once. I'm more inclined to wait until we're done with #137 if that's ok. Then I think it should be simple enough to merge the master back here and clean up the commit history. If you don't think that will work, I will put together a clean commit off master. |
shoyer
commented
May 21, 2014
That's fine, we can deal with #137 first. |
Conflicts: doc/tutorial.rst test/test_dataset.py xray/dataset.py
jhamman
commented
May 21, 2014
I'm closing this since, as you mentioned above, its gotten messy. I'm cleaning it up now and will reopen when I've got my act in order. |
shoyer
commented
May 21, 2014
I've found GitHub doesn't handle rebases on master very well -- you end up with a lot of extra commits in your PR which makes it hard to review. So the cleanest thing to do may be to open a new PR. |
jhamman
commented
May 21, 2014
Exactly, see #141 for new PR. |
Fixes#138