From 76eb54b6f885b4a6a5017ad2412992f859a87204 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 27 Nov 2020 13:32:02 +0100 Subject: [PATCH] docs: minor clarification of review process --- docs/misc/review.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/misc/review.md b/docs/misc/review.md index e5b70ca4c..ff307be87 100644 --- a/docs/misc/review.md +++ b/docs/misc/review.md @@ -28,7 +28,9 @@ 8. The author runs `git rebase -i [main branch] --autosquash` which squashes the fixup commits into their respective parents and then force-pushes the rebase branch. 9. The author makes a final check and merges the PR. If the rebase involved resolving some complicated - merge conflicts, then the author may ask the reviewer for a final check. + merge conflicts, then the author may ask the reviewer for a final check. GitHub's _Rebase and merge_ + should be used, not _Squash and merge_. + 10. The author deletes their branch. ## Example