Browse Source

Merge pull request #576 from NullConstant/ocdfix

Remove the OCD remark
Chris Bradfield 7 years ago
parent
commit
2e4cb96a06
1 changed files with 4 additions and 4 deletions
  1. 4 4
      community/contributing/pr_workflow.rst

+ 4 - 4
community/contributing/pr_workflow.rst

@@ -326,10 +326,10 @@ That should do the trick, but...
 Mastering the PR workflow: the rebase
 Mastering the PR workflow: the rebase
 -------------------------------------
 -------------------------------------
 
 
-On the situation outlined above, your fellow contributors with an OCD
-regarding the Git history might ask your to *rebase* your branch to *squash*
-or *meld* the last two commits together (i.e. the two related to the project
-manager), as the second commit basically fixes an issue in the first one.
+On the situation outlined above, your fellow contributors who are particularly
+pedantic regarding the Git history might ask your to *rebase* your branch to
+*squash* or *meld* the last two commits together (i.e. the two related to the
+project manager), as the second commit basically fixes an issue in the first one.
 
 
 Once the PR is merged, it is not relevant for a changelog reader that the PR
 Once the PR is merged, it is not relevant for a changelog reader that the PR
 author made mistakes; instead, we want to keep only commits that bring from
 author made mistakes; instead, we want to keep only commits that bring from