Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

more explicit about what remote means in context#25845

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
timhoffm merged 3 commits intomatplotlib:mainfromstory645:remote
May 11, 2023

Conversation

story645
Copy link
Member

building off of#25828 and@timhoffm's comment, mostly reworded/moved things (very little if any change in length) to try and make it more explicit that in this context origin and upstream are aliases for remote repositories.

story645and others added2 commitsMay 10, 2023 18:44
building off ofmatplotlib#25828 and@timhoffm's comment, mostly reworded/movedthings (very little if any change in length) to try and make it moreexplicit that in this context origin and upstream are aliases forremote repositories.Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Copy link
Member

@timhoffmtimhoffm left a comment

Choose a reason for hiding this comment

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

Take or leave my Suggestion und the link.

@@ -82,6 +80,10 @@ so that you can access the latest changes there (see also `Managing remote repos

git remote add upstream git@github.com:matplotlib/matplotlib.git

You can now use ``upstream`` to retrieve the most current snapshot of the source
code, as described in :ref:`development-workflow`. See also `Managing remote repositories
<https://docs.github.com/en/get-started/getting-started-with-git/managing-remote-repositories>`__.
Copy link
Member

@timhoffmtimhoffmMay 11, 2023
edited
Loading

Choose a reason for hiding this comment

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

I propose to move the "Managing remote repositories" link to the notes section below (or remove it completely). While it is about remotes, it only covers rarely needed management operations on remotes, not something one would need for regular development work:

Adding a remote repository. - we've covered that ourselves
Changing a remote repository's URL - the matplotlib repository won't move
Renaming a remote repository - no need to change the nameupstream
Removing a remote repository - no need to decouple from upstream

story645 and rcomer reacted with thumbs up emoji
Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Sure, just building locally now. I like having some words under code blocks and pictures to complete out a section, but here the link to the dev workflow does the trick.

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Ok,so I thought the notes were getting unwieldy so I took the easy route of putting them into a dropdown (that I left open by default so I haven't changed the look)
image

@timhoffmtimhoffm added this to thev3.7-doc milestoneMay 11, 2023
@timhoffmtimhoffm merged commit7f50e7a intomatplotlib:mainMay 11, 2023
@QuLogic
Copy link
Member

@meeseeksdev backport to v3.7.x
@meeseeksdev backport to v3.7.1-doc

@lumberbot-app
Copy link

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.7.xgit pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7f50e7adfe53fcc55e0c2a7474fab611f9c480cb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #25845: more explict about what remote means in context'
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-25845-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR#25845 on branch v3.7.x (more explict about what remote means in context)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

@lumberbot-app
Copy link

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.7.1-docgit pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 7f50e7adfe53fcc55e0c2a7474fab611f9c480cb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #25845: more explict about what remote means in context'
  1. Push to a named branch:
git push YOURFORK v3.7.1-doc:auto-backport-of-pr-25845-on-v3.7.1-doc
  1. Create a PR against branch v3.7.1-doc, I would have named this PR:

"Backport PR#25845 on branch v3.7.1-doc (more explict about what remote means in context)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

@QuLogic
Copy link
Member

OK, not sure why it didn't post that the first time, but not going to go through the trouble of backporting myself.

@QuLogicQuLogic modified the milestones:v3.7-doc,v3.8.0May 12, 2023
@ksundenksunden changed the titlemore explict about what remote means in contextmore explicit about what remote means in contextAug 9, 2023
@story645story645 deleted the remote branchOctober 12, 2023 16:05
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@rcomerrcomerrcomer left review comments

@timhoffmtimhoffmtimhoffm approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.8.0
Development

Successfully merging this pull request may close these issues.

4 participants
@story645@QuLogic@timhoffm@rcomer

[8]ページ先頭

©2009-2025 Movatter.jp