Skip to content

Commit

Permalink
doc: explain why GitHub merge button is not used
Browse files Browse the repository at this point in the history
Adds documentation and explicit reasons on why
the GitHub web interface button is not used. This was
explained in the referenced issue by @thealphanerd.

Fixes: nodejs#8893
  • Loading branch information
jalafel committed Oct 12, 2016
1 parent 3d54ea4 commit d42d56f
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion doc/onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,14 @@ onboarding session.

## Landing PRs: Details

* Please never use GitHub's green "Merge Pull Request" button.
* 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 old merge method will write an ugly commit message.
* The old rebase & merge method adds metadata to the commit title.
* The latest rebase method changes the author.
* The squash & merge method has been known to add metadata to the commit title.


Update your `master` branch (or whichever branch you are landing on, almost always `master`)

Expand Down

0 comments on commit d42d56f

Please sign in to comment.