Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
DOC: minor tweaks to manual backport instructions#11186
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
Uh oh!
There was an error while loading.Please reload this page.
Conversation
f051132 toe2ea782Comparedoc/devel/coding_guide.rst Outdated
| git add lib/matplotlib/conflicted_file.py | ||
| git add lib/matplotlib/conflicted_file2.py | ||
| git commit -a -m "MRG: backport of SHA" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Don't think you should add-a. You've already added the files manually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
- The message is in conflict with the text above: : "When doing backports please copy the form used by meeseekdev, Backport PR #XXXX: TITLE OF PR".
- Do we use prefixes like MRG for commit messages? If so, where's that documented?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Thanks! Both comments fixed....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
... good thing I self merged my mis-titled backport PR 😉
e2ea782 to922c950Comparedoc/devel/coding_guide.rst Outdated
| git cherry-pick -m 1 TARGET_SHA | ||
| # resolve conflicts and commit if required | ||
| Use your discretion to push directly to upstream or to open a PR. | ||
| The conflicts will have to be searched for by hand, (search on ``>>>>>``) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Conflicting files are shown ingit status, so conflicts only need to be searched in those file, not all of them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Ah, OK, didn't know that. I'll change to suggesting that.
a46d183 to6ea6958CompareI tried the tutorial on#11188. After fixing the changes, I had to |
Oh, didn’t know about that either. So did you have to commit as well? I.e. add, commit, continue, or just add and continue? |
I just did add, continue, push. |
6ea6958 tob3d5b40Compareduly fixed... |
Backport PR#11186 on branch v2.2.2-doc
PR Summary
A couple of minor tweaks to the backport instructions.
upstreamfrommatplotlibsince I think thats what we tell people to use in the rest of the docs.PR Checklist