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

Update index.rst correcting the date of release 0.11 #967

Merged
merged 1 commit into from Mar 15, 2016

Conversation

Garyfallidis
Copy link
Contributor

I cherry picked the change from maint/0.11.x and updated the 0.11 website.

@arokem
Copy link
Contributor

arokem commented Mar 13, 2016

Pinging @matthew-brett, because I am not sure: is this the way we are supposed to add things that also go into maint/0.11.x?

@matthew-brett
Copy link
Contributor

The general idea is to do bug-fixes on maint/0.11.x and maybe doc fixes like this one, and then merge the main brain into master. But - to do that, you have to be disciplined first to make sure you've correctly done the original merge that ignores the changes you don't want from maint/0.11.x - such as the version number changes, and second, not to cherry-pick back or forward from master.

In the end, it seems to usually happen that someone does this, and so you're back to old-school, cherry-picking commits back and forth.

@arokem
Copy link
Contributor

arokem commented Mar 15, 2016

OK. Thanks.

arokem added a commit that referenced this pull request Mar 15, 2016
Update index.rst correcting the date of release 0.11
@arokem arokem merged commit 1418744 into dipy:master Mar 15, 2016
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

3 participants