Add note about merging PRs in DEVELOPMENT.md (#776)

This commit is contained in:
Alexandre Archambault 2018-02-13 14:56:25 +01:00 committed by GitHub
parent 137973c06c
commit 7b12da18b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions

View File

@ -157,3 +157,11 @@ To build a distributable binary
# Artifact will be placed under dist/
java -jar dist/coursier-cli.jar fetch --help
```
# Merging PRs on GitHub
Use either "Create merge commit" or "Squash and merge".
Use "Create merge commit" if the commit list is clean enough (each commit has a clear message, and doesn't break simple compilation and test tasks).
Use "Squash and merge" in the other cases.