From 0dcf7e35791f7d2e1cc68ceb44c84d5aef8bdc82 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 23 Feb 2021 10:54:03 +0800 Subject: [PATCH] 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 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f2b853007..5072d4194e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -109,7 +109,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