CONTRIBUTING: Mention not to open several pulls #8771

pull luke-jr wants to merge 1 commits into bitcoin:master from MarcoFalke:Mf1609-ContributeDoc changing 1 files +9 −0

luke-jr commented at 9:31 AM on September 21, 2016: member

No description provided.
in CONTRIBUTING.md:None in fa09f34a29 outdated
```
  86 | @@ -87,6 +87,15 @@ before it will be merged. The basic squashing workflow is shown below.
  87 |      # save and quit
  88 |      git push -f # (force push to GitHub)
  89 |  
  90 | +If you need help with squashing (or other workflows with `git`), you can
  91 | +alternatively enable "Allow edits from maintainers" in the right GitHub
  92 | +sidebar and ask for help in the pull request.
```
luke-jr commented at 9:32 AM on September 21, 2016:

Not sure this is something we want to encourage...

laanwj commented at 9:34 AM on September 21, 2016:

Well, not in general, but we want to encourage it for people that don't know how to use git. I'd prefer people to learn how to do it themselves, of course, but personally tutoring everyone how to use git (especially those that use the web interface :( ) is a lot of work.

in CONTRIBUTING.md:None in fa09f34a29 outdated

  86 | @@ -87,6 +87,15 @@ before it will be merged. The basic squashing workflow is shown below.
  87 |      # save and quit
  88 |      git push -f # (force push to GitHub)
  89 |  
  90 | +If you need help with squashing (or other workflows with `git`), you can
  91 | +alternatively enable "Allow edits from maintainers" in the right GitHub
  92 | +sidebar and ask for help in the pull request.
  93 | +
  94 | +Please refrain from creating several pull request for the same topic.

luke-jr commented at 9:32 AM on September 21, 2016:

"same change"?

laanwj commented at 12:07 PM on September 21, 2016:

should this be "several pull requests"?

MarcoFalke force-pushed on Sep 21, 2016
MarcoFalke added the label Docs and Output on Sep 21, 2016
MarcoFalke approved
MarcoFalke commented at 9:46 AM on September 21, 2016: member

Addressed feedback
luke-jr commented at 10:03 AM on September 21, 2016: member

ACK
MarcoFalke force-pushed on Sep 21, 2016
jonasschnelli approved
jonasschnelli commented at 12:57 PM on September 21, 2016: contributor

ACK
gmaxwell commented at 6:38 PM on September 22, 2016: contributor

Seems reasonable, though the minor "Fix 0.13 release notes attribution mistake" commit seems unrelated.
CONTRIBUTING: Mention not to open several pulls faa91bc335
MarcoFalke force-pushed on Sep 22, 2016
laanwj merged this on Sep 25, 2016
laanwj closed this on Sep 25, 2016
laanwj referenced this in commit bc9e3ab29f on Sep 25, 2016
MarcoFalke deleted the branch on Sep 25, 2016
codablock referenced this in commit 203e29b5f4 on Sep 19, 2017
codablock referenced this in commit fdc87cecc6 on Jan 11, 2018
andvgal referenced this in commit 8db384009f on Jan 6, 2019
DrahtBot locked this on Sep 8, 2021

Contributors

Labels