Skip to content

Fix branch name in "Deleting a branch on GitHub_" section #7131

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 3 commits into from
Sep 18, 2016

Conversation

afvincent
Copy link
Contributor

@tacaswell : I could not find any "test_branch" in the example code in the "Deleting a branch on GitHub_" section, so I guess it was simply an old name forgotten after a change.

@afvincent afvincent added this to the 2.0.1 (next bug fix release) milestone Sep 18, 2016
@@ -397,7 +397,7 @@ Deleting a branch on GitHub_
# delete branch on GitHub
git push origin :my-unwanted-branch

(Note the colon ``:`` before ``test-branch``. See also:
Note the colon ``:`` before ``my-unwanted-branch``. See also:
http://github.com/guides/remove-a-remote-branch
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 make this https while you're here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/guides/remove-a-remote-branch does not seem to be valid and redirects toward https://help.github.com/categories/managing-remotes/. From there, I have chosen the (https) link that sounded related to "removing a remote branch".

Copy link
Member

Choose a reason for hiding this comment

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

No, that link is for deleting a remote itself, not the a remote branch. I think the correct link is https://help.github.com/articles/pushing-to-a-remote/#deleting-a-remote-branch-or-tag

@afvincent
Copy link
Contributor Author

Huh, the Travis failure report looks weird compared to the ones I am used to (and it is way longer). Is it something normal?

@tacaswell
Copy link
Member

Given that you only changed rst files, it is almost certainly just the tests being flaky. Restarted the failing test.

@QuLogic
Copy link
Member

QuLogic commented Sep 18, 2016

The report looks different because that run uses pytest instead of nose.

@NelleV
Copy link
Member

NelleV commented Sep 18, 2016

Thanks!

@NelleV NelleV merged commit d1b837f into matplotlib:master Sep 18, 2016
@afvincent
Copy link
Contributor Author

@NelleV I think that @QuLogic is right : I was tricked by the URL name and the correct link should be https://help.github.com/articles/pushing-to-a-remote/#deleting-a-remote-branch-or-tag, where the presented solution is indeed similar to @tacaswell 's code and remark.

Should I correct this in a new PR or is there a way to do otherwise (like reverting the fresh merge)?

@tacaswell
Copy link
Member

just do another PR.

@afvincent afvincent deleted the doc_typos_devel_workflow branch September 19, 2016 05:02
QuLogic pushed a commit that referenced this pull request Sep 19, 2016
@QuLogic
Copy link
Member

QuLogic commented Sep 19, 2016

Backported to v1.5.3-doc as f99de8a.

@QuLogic QuLogic modified the milestones: 2.0.1 (next bug fix release), 2.0 (style change major release) Dec 7, 2016
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.

5 participants