Skip to content

Commit

Permalink
chore(template): Use ready to merge label instead of merge button (#3153
Browse files Browse the repository at this point in the history
)

* chore(template): Added PR template

* chore(template): Updated contributing readme

* chore(template): feedback

* chore(template): rename bug report

* chore(template): undo something

* chore(template): undo something
  • Loading branch information
greg-in-a-box authored Nov 28, 2022
1 parent bf3256a commit b061ff8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
File renamed without changes.
3 changes: 3 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<!-- Please add the `ready-to-merge` label when you have received both approvals instead of clicking the merge button
Using the `ready-to-merge` label adds your approved PR to the merge train and when master is in a green state from the previous merge.
Mergify will merge your PR based on the queue -->
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,7 @@ Make sure that all tests are passing before submitting a pull request. See the [
Send the pull request from your feature branch to us. Be sure to include a description (as mentioned above in step 4) that lets us know what work you did.

Keep in mind that we like to see one issue addressed per pull request, as this helps keep our git history clean and we can more easily track down issues.

### Step 8: Add `ready-to-merge` label

After your pull request has been approved and the check statuses are green, please add the `ready-to-merge` label instead of using the merge button. This will add your pull request to the merge queue and merge your pull request when it is safe. If you are unable to add the `ready-to-merge` label, please ask an approver or maintainer for assistance.

0 comments on commit b061ff8

Please sign in to comment.