diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-25 13:09:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-25 13:10:11 +0200 |
| commit | bc9e3ab29f9b5db57b77a702a5ad74bdc51ad634 (patch) | |
| tree | d1a2a12c7058a76806432221642c42d8e3754fd2 /CONTRIBUTING.md | |
| parent | 279bbadc8ba909d614c3eeb94d677230aa8ce2b7 (diff) | |
| parent | faa91bc335da1c0f20b7a3375b1cfcfdc7b10af5 (diff) | |
| download | bitcoin-bc9e3ab29f9b5db57b77a702a5ad74bdc51ad634.tar.xz | |
Merge #8771: CONTRIBUTING: Mention not to open several pulls
faa91bc CONTRIBUTING: Mention not to open several pulls (MarcoFalke)
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c8cb666b4d..fd1a912c4f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,6 +87,15 @@ before it will be merged. The basic squashing workflow is shown below. # save and quit git push -f # (force push to GitHub) +If you have problems with squashing (or other workflows with `git`), you can +alternatively enable "Allow edits from maintainers" in the right GitHub +sidebar and ask for help in the pull request. + +Please refrain from creating several pull requests for the same change. +Use the pull request that is already open (or was created earlier) to amend +changes. This preserves the discussion and review that happened earlier for +the respective change set. + The length of time required for peer review is unpredictable and will vary from pull request to pull request. |