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

Development documentation instructs to remove `master` #655

Closed
arokem opened this Issue May 25, 2015 · 4 comments

Comments

Projects
None yet
2 participants
@arokem
Member

arokem commented May 25, 2015

Is that really a good idea?

I wasn't sure how to rebase on top of upstream/master from a feature branch in this configuration.

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented May 25, 2015

@arokem

This comment has been minimized.

Member

arokem commented May 25, 2015

How do you go about creating a main-master branch once you have nuked the
master branch, if all the branches you have are feature branches that
have diverged from master?

On Mon, May 25, 2015 at 8:53 AM, Matthew Brett notifications@github.com
wrote:

I think it is a good idea, to avoid very common confusion as to which
'master' you have.

For simplicity I recommend rebasing on upstream/master or equivalent.

I sometimes have a local branch 'main-master' that tracks upstream master.


Reply to this email directly or view it on GitHub
#655 (comment).

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented May 25, 2015

@arokem

This comment has been minimized.

Member

arokem commented May 25, 2015

@arokem arokem closed this May 25, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment