docs(MAINTAINING): note that merging PRs should be done locally

reviewable/pr3602/r1
Zetok Zalbavar 2016-08-08 11:38:28 +01:00
parent 2045585c77
commit c8bbd076da
No known key found for this signature in database
GPG Key ID: C953D3880212068A
1 changed files with 3 additions and 0 deletions

View File

@ -48,6 +48,9 @@ git config --global alias.logs 'log --show-signature'
# Pull requests
- **do not** push any `Merge`, `Squash & Merge`, etc. buttons on the website!
The only allowed way of merging is locally, since otherwise merge will not
be signed, and websites can fairly well mess things up.
- **always** test PR that is being merged.
- **always** GPG-sign PR that you're merging.
- **use** [`merge-pr.sh`] script to merge PRs, e.g. `./merge-pr.sh 1234`.