StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

docs(MAINTAINING.md): note that not using merge script can break builds

Browse Source
This commit is contained in:
Zetok Zalbavar 2016-07-06 14:04:30 +01:00
parent 29dbd03076
commit 34fb127db1
No known key found for this signature in database
GPG Key ID: C953D3880212068A
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MAINTAINING.md
View File

@ -50,6 +50,14 @@ git config --global alias.logs 'log --show-signature'
- **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`.
You don't have to use it, but then you're running into risk of breaking
travis build of master & other PRs, since it verifies all commit messages,
indlucing merge messages.
Risk, that can be avoided when one doesn't type manually merge message :wink:
- **might want** to use [`test-pr.sh`].
Commits that are about to be merged don't have to be signed, but merge-commit
**must** be signed. To simplify process, and ensure that things are done
@ -91,3 +99,4 @@ git config --global alias.logs 'log --show-signature'
[commit message format]: /CONTRIBUTING.md#commit-message-format
[`merge-pr.sh`]: /merge-pr.sh
[`test-pr.sh`]: /test-pr.sh