Skip to content

Clarify backports documentation #7981

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

Merged
merged 2 commits into from
Feb 6, 2017
Merged

Conversation

story645
Copy link
Member

I'm so very confused so trying to demystify how this works. @QuLogic

I'm so very confused so trying to demystify how this works. @QuLogic
Copy link
Member

@QuLogic QuLogic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Branch name updates.

Assuming we have ``matplotlib`` as a read-only remote to the
matplotlib/matplotlib repo and ``DANGER`` as a read/write remote to
the matplotlib/matplotlib repo, we do a backport from master to 2.x.
We do a backport from master to 2.x. assuming:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change this to v2.0.x since that branch no longer exists?

@@ -102,7 +105,7 @@ the merge notification) or through the git CLI tools.::
git checkout v2.x
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And change v2.x in this whole block as well.

@story645 story645 changed the title Clarifying backports documentation Clarify backports documentation Jan 30, 2017
@dstansby dstansby changed the title Clarify backports documentation [MRG+1] Clarify backports documentation Jan 30, 2017
@QuLogic QuLogic changed the title [MRG+1] Clarify backports documentation Clarify backports documentation Feb 6, 2017
@QuLogic QuLogic merged commit eeb5a76 into matplotlib:master Feb 6, 2017
@QuLogic QuLogic added this to the 2.1 (next point release) milestone Feb 6, 2017
@story645 story645 deleted the coding_guide branch March 7, 2017 01:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants