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

Consistently prefixes Functions with '_.' #189

Merged
merged 1 commit into from
Jan 5, 2015

Conversation

LewisJEllis
Copy link
Collaborator

Fixes #170

@jeromew
Copy link
Collaborator

jeromew commented Jan 3, 2015

@LewisJEllis great thanks. Have you already discussed with @vqvu on what is the best strategy to keep 3.0.0 in sync with 2.x ? 3.0.0 should probably be regularly rebased on top of 2.x.

We already have a few commits lagging from what I see and we'd better address this workflow before the thing becomes unmergeable.

@LewisJEllis LewisJEllis mentioned this pull request Jan 3, 2015
34 tasks
@vqvu
Copy link
Collaborator

vqvu commented Jan 4, 2015

I don't think a rebase is required; a rebase would break anyone trying to work on 3.0.0. I was planning on someone just doing a git merge master once in a while (doesn't have to be all the time to keep the tree clean) and fixing anything that's broken.

@jeromew
Copy link
Collaborator

jeromew commented Jan 5, 2015

I was thinking about '3.0.0' like a shared PR where we would rebase it regularly so that it has a clear log footprint (the tip of 2.x + modifications). Do you really think many people are 'working on 3.0.0' apart from the usual suspects ?

But I agree that once it is published it is not a good thing to rebase it. maybe if we need a cleaner log footprint we can do a 3.0.1 branch or whatever.

jeromew added a commit that referenced this pull request Jan 5, 2015
Consistently prefixes Functions with '_.' in documentation
@jeromew jeromew merged commit db31e00 into caolan:master Jan 5, 2015
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.

_. prefix in Functions section of docs
3 participants