From b65b36fe0b08c41b29fe0d2606ef472d9ac35570 Mon Sep 17 00:00:00 2001 From: Rama Del Maestro Date: Fri, 22 Dec 2023 14:17:16 -0800 Subject: [PATCH 1/2] Fixed typo in pr_workflow.rst --- contributing/workflow/pr_workflow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/workflow/pr_workflow.rst b/contributing/workflow/pr_workflow.rst index e722526cbd1..074908f5653 100644 --- a/contributing/workflow/pr_workflow.rst +++ b/contributing/workflow/pr_workflow.rst @@ -436,7 +436,7 @@ The interactive rebase If you didn't follow the above steps closely to *amend* changes into a commit instead of creating fixup commits, or if you authored your changes without being -aware of our workflow and Git usage tips, reviewers might request of your to +aware of our workflow and Git usage tips, reviewers might request of you to *rebase* your branch to *squash* some or all of the commits into one. Indeed, if some commits have been made following reviews to fix bugs, typos, etc. From 909129255e72d711616a026868f766078096ec88 Mon Sep 17 00:00:00 2001 From: Rama Del Maestro Date: Tue, 26 Dec 2023 14:18:01 -0800 Subject: [PATCH 2/2] Update wording in contributing/workflow/pr_workflow.rst Co-authored-by: Matthew --- contributing/workflow/pr_workflow.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/workflow/pr_workflow.rst b/contributing/workflow/pr_workflow.rst index 074908f5653..b11b30d3415 100644 --- a/contributing/workflow/pr_workflow.rst +++ b/contributing/workflow/pr_workflow.rst @@ -436,7 +436,7 @@ The interactive rebase If you didn't follow the above steps closely to *amend* changes into a commit instead of creating fixup commits, or if you authored your changes without being -aware of our workflow and Git usage tips, reviewers might request of you to +aware of our workflow and Git usage tips, reviewers might request you to *rebase* your branch to *squash* some or all of the commits into one. Indeed, if some commits have been made following reviews to fix bugs, typos, etc.