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

Blosc as subtree #15

Closed
wants to merge 6 commits into from
Closed

Blosc as subtree #15

wants to merge 6 commits into from

Conversation

esc
Copy link
Member

@esc esc commented Apr 4, 2013

Subtree version. The last commit is just an example of a subtree update would look and should not be merged.

@FrancescAlted
Copy link
Member

This is awesome. I really like the subtree approach better than the submodule one. I would like to merge this PR, but I suppose I cannot do that automatically, right? So the best would be to individually pick every commit here from your repo, except the one labeled as 'do not merge'?

Thanks,

@esc
Copy link
Member Author

esc commented Apr 10, 2013

After pondering on it some more, I also thing the subtree approach is the best one for this use-case. The Blosc sources are small, and this is very much like the previous approach. Except that we have formalized a little how the sources get merged. I will push a new PR which can be merged automatically.

@esc
Copy link
Member Author

esc commented Apr 10, 2013

See: #23. Will close all the others ones.

@esc esc closed this Apr 10, 2013
@esc esc mentioned this pull request Apr 10, 2013
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.

None yet

2 participants