Skip to content

/ devguide

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

Jump to bottom

Make it clearer that "automerge" exists and is preferred #518

Open
Mariatta opened this issue Aug 2, 2019 · 1 comment
Open

Make it clearer that "automerge" exists and is preferred #518

Mariatta opened this issue Aug 2, 2019 · 1 comment

Comments

@Mariatta
Copy link
Member

@Mariatta Mariatta commented Aug 2, 2019

And provide better instructions about how to merge manually.

One thing that people don't realize is that the second PR number (in backport pull request) is autogenerated by GitHub, and had to be removed manually by hand before we click "Squash and Merge" button.

If we don't want to have to remember to remove that manually, then utilize the automerge feature.

As a reminder, automerge will be triggered if:

  1. In case of miss-islington's own PR, if the PR was approved by a core dev (has awaiting merge label), tests all passing, CLA signed, and no do-not-merge label.
  2. In case it is not miss-islington's own PR: same as the above, with addition of automerge label
@maxking
Copy link
Contributor

@maxking maxking commented Aug 11, 2019 •
edited

I wonder if the right place for this content is https://devguide.python.org/committing/ or if there is a need for a dedicated page which helps core devs understand the features of the bots?

There already is #520 to make the above page simpler, but I feel more text on that page will just be invisible. But perhaps when it is re-written to be a more of a step-by-step guide, it can delegate to specific sections of this new page dedicated to bots when pointing out the workflow.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
@maxking @Mariatta
You can’t perform that action at this time.