Skip to content

Commit 1e7dd58

Browse files
committed
Merge #21263: doc: Clarify that squashing should happen before review
fa1f3a2 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 fa1f3a2 fanquake: ACK fa1f3a2 Tree-SHA512: e9222191a6e9cf9867bd1f29982526dd7b746b70dd2cc94f485256ec98ff2d3941c9b40728935e151d13795239334e334b71ad41044909cb2849f57776811a94
2 parents 3371758 + fa1f3a2 commit 1e7dd58

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Note: Code review is a burdensome but important part of the development process,
197197

198198
If your pull request contains fixup commits (commits that change the same line of code repeatedly) or too fine-grained
199199
commits, you may be asked to [squash](https://git-scm.com/docs/git-rebase#_interactive_mode) your commits
200-
before it will be merged. The basic squashing workflow is shown below.
200+
before it will be reviewed. The basic squashing workflow is shown below.
201201

202202
git checkout your_branch_name
203203
git rebase -i HEAD~n

0 commit comments

Comments
 (0)