Can someone please finish merging GH-13482?
https://github.com/python/cpython/pull/13482 is a simple doc change for difflib, which I approved some months ago. But I don't know the current workflow well enough to finish it myself. Like: - Does something special need to be done for doc changes? - Since this is a 1st-time contributor, does it need a change to the ACKS file? - Anything else? I'm sure this is all obvious after you've done it once, but I haven't. So I'll watch and do it myself next time ;-)
- Does something special need to be done for doc changes?
Nothing special. - Since this is a 1st-time contributor, does it need a change to the ACKS
file?
I think the change is trivial enough, the misc/acks is not necessary. - Anything else? 1. Does it need to be backported? If so, please add the "needs backport to .." label. 2. Add the "🤖 automerge" label. The bot will take care of merging. It will use the PR title and description as commit message. If the PR title/ description is not good enough as commit message, edit it first before adding the "🤖 automerge" label. So I'll watch and do it myself next time ;-) Hopefully the above instructions are clear and simple enough, so I'll let you trigger the automerge this time. ᐧ
[Mariatta <mariatta.wijaya@gmail.com>] - Since this is a 1st-time contributor, does it need a change to the ACKS file?
I think the change is trivial enough, the misc/acks is not necessary.
- Anything else?
1. Does it need to be backported? If so, please add the "needs backport to .." label.
2. Add the "🤖 automerge" label. The bot will take care of merging. It will use the PR title and description as commit message. If the PR title/ description is not good enough as commit message, edit it first before adding the "🤖 automerge" label.
So I'll watch and do it myself next time ;-)
Hopefully the above instructions are clear and simple enough, so I'll let you trigger the automerge this time.
So I tried ;-) No idea what did and didn't work. I got several of these messages: """ Sorry, I can't merge this PR. Reason: Base branch was modified. Review and try the merge again.. """ I'm guessing (don't know) those are about failed auto-backports. I don't have time now to try to figure it all out - It seemed to have spawned a number of new GH PRs for the backports, and I'm thoroughly lost now :-( The change did show up when I pulled from upstream master, so I expect that part did work.
We probably need to update https://devguide.python.org/committing/ to have a step-by-step list of how to make a merge works and how to handle backports instead of the wall of text that we have. (It's already outdated anyway, e.g. `Misc/ACKS` really isn't important as git itself records the author of the commit and so that can be used with `Misc/ACKS` for old commits to gather the list of folks who have contributed.)
[Brett Cannon <brett@python.org>]
We probably need to update https://devguide.python.org/committing/ to have a step-by-step list of how to make a merge works and how to handle backports instead of the wall of text that we have. (It's already outdated anyway, e.g. `Misc/ACKS` really isn't important as git itself records the author of the commit and so that can be used with `Misc/ACKS` for old commits to gather the list of folks who have" contributed.)
Don't put too much weight on my screwups ;-) I was appalled to hear that the OP's contribution was still sitting unmerged, and was in a hurry to resolve that at a time I _had_ no significant time to give to it. Mariatta and Terry Reedy finished up what I left undone, so in the end it's all good :-) And there's a problem with the GitHub workflow docs that may be unique to me: we have helpful layers of automation, but they're shortening a git workflow I don't understand even without the automation. With the automation, I'm just doubly clueless. That's because I'm old. My capacity to give a rip about source control system quirks was apparently entirely used up when I spent several weeks mastering the intricacies of Mercurial. Try as I might, I just haven't been able to force myself to become competent with git. It's not that I disapprove of git! It's apparently more that we're each born with a finite capacity for being _able_ to learn Yet Another New Source Control System, and mine was used up on YANSCS #8 ;-) aging-isn't-for-the-optimistic-ly y;rs - tim
Tim Peters wrote:
We probably need to update https://devguide.python.org/committing/ to have a step-by-step list of how to make a merge works and how to handle backports instead of the wall of text that we have. (It's already outdated anyway, e.g. Misc/ACKS really isn't important as git itself records the author of the commit and so that can be used with Misc/ACKS for old commits to gather the list of folks who have" contributed.) Don't put too much weight on my screwups ;-) I was appalled to hear
[Brett Cannon brett@python.org] that the OP's contribution was still sitting unmerged, and was in a hurry to resolve that at a time I _had_ no significant time to give to it.
Sure, but I and I hope everyone else here wants to make the dev process as easy as possible so that more people help out regardless of their comfort with git so that PRs are dealt with fast enough none of us become appalled. ;) So the fact you had any struggles suggests there is room for improvement, even if the docs say "click the green button and if miss-islington says something happened then come to python-committers for help".
Mariatta and Terry Reedy finished up what I left undone, so in the end it's all good :-) And there's a problem with the GitHub workflow docs that may be unique to me: we have helpful layers of automation, but they're shortening a git workflow I don't understand even without the automation. With the automation, I'm just doubly clueless. That's because I'm old. My capacity to give a rip about source control system quirks was apparently entirely used up when I spent several weeks mastering the intricacies of Mercurial. Try as I might, I just haven't been able to force myself to become competent with git. It's not that I disapprove of git! It's apparently more that we're each born with a finite capacity for being _able_ to learn Yet Another New Source Control System, and mine was used up on YANSCS #8 ;-) aging-isn't-for-the-optimistic-ly y;rs - tim
Yeah, but I still want your filled brain to be able to use our workflow to help put you to work. ;)
participants (3)
-
Brett Cannon -
Mariatta -
Tim Peters