diff options
| author | fanquake <fanquake@gmail.com> | 2021-02-23 10:54:03 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-02-23 10:55:03 +0800 |
| commit | 1e7dd584a5f998a5b307285a7bc29ea4ad63ebc8 (patch) | |
| tree | 0c0491d26d6ff6a124b543e8e1b44ca28555252f | |
| parent | 3371758af49cfe431141dfc314b4406b79bce1c3 (diff) | |
| parent | fa1f3a26a7541ba82a28c2a5fd09401be825c888 (diff) | |
| download | bitcoin-1e7dd584a5f998a5b307285a7bc29ea4ad63ebc8.tar.xz | |
Merge #21263: doc: Clarify that squashing should happen before review
fa1f3a26a7541ba82a28c2a5fd09401be825c888 doc: Clarify that squashing should happen before review (MarcoFalke)
Pull request description:
Unlike other repos, in our repo code review happens before merge, ideally.
Thus, rebases, solving merge conflicts and squashing should happen before review, which again happens before merge.
ACKs for top commit:
theStack:
ACK fa1f3a26a7541ba82a28c2a5fd09401be825c888
fanquake:
ACK fa1f3a26a7541ba82a28c2a5fd09401be825c888
Tree-SHA512: e9222191a6e9cf9867bd1f29982526dd7b746b70dd2cc94f485256ec98ff2d3941c9b40728935e151d13795239334e334b71ad41044909cb2849f57776811a94
| -rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e11474382..ae2379fbd5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -197,7 +197,7 @@ Note: Code review is a burdensome but important part of the development process, If your pull request contains fixup commits (commits that change the same line of code repeatedly) or too fine-grained commits, you may be asked to [squash](https://git-scm.com/docs/git-rebase#_interactive_mode) your commits -before it will be merged. The basic squashing workflow is shown below. +before it will be reviewed. The basic squashing workflow is shown below. git checkout your_branch_name git rebase -i HEAD~n |