diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 4ce11257b707f2..fd930dab3a96dc 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -302,16 +302,13 @@ The CTC should serve as the final arbiter where required. ## Landing Pull Requests -* Please never use GitHub's green ["Merge Pull Request"](https://help.github.com/articles/merging-a-pull-request/#merging-a-pull-request-using-the-github-web-interface) button. - * If you do, please force-push removing the merge. - * Reasons for not using the web interface button: - * The merge method will add an unnecessary merge commit. - * The rebase & merge method adds metadata to the commit title. - * The rebase method changes the author. - * The squash & merge method has been known to add metadata to the - commit title. - * If more than one author has contributed to the PR, only the - latest author will be considered during the squashing. +If the Pull Request can be landed as a single commit, you can use GitHub's green +["Squash and merge"](https://help.github.com/articles/about-pull-request-merges/#squash-and-merge-your-pull-request-commits) +button, as long as you: + * Remove the PR number, e.g. `(#1048)`, from the commit message title. + * Ensure that the commit message is correct, remove any fixup commit messages. + * Make sure CI was run on the latest update to the Pull Request. + * Add the correct metadata (see below). Always modify the original commit message to include additional meta information regarding the change process: