diff options
| -rw-r--r-- | CONTRIBUTING.md | 4 | ||||
| -rw-r--r-- | docs/pr-guide.md | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9bf82879aa5..a8cf7c3ce6d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,10 +67,6 @@ We use and recommend the following workflow: - The next official build will automatically include your change. - You can delete the branch you used for making the change. -Note: It is OK for your PR to include a large number of commits. Once your change is accepted, you will be asked to squash your commits into one or some appropriately small number of commits before your PR is merged. - -Note: It is OK to create your PR as "[WIP]" on the upstream repo before the implementation is done. This can be useful if you'd like to start the feedback process concurrent with your implementation. State that this is the case in the initial PR comment. - ## Up for Grabs The team marks the most straightforward issues as [up for grabs](https://github.com/dotnet/runtime/labels/up-for-grabs). This set of issues is the place to start if you are interested in contributing but new to the codebase. diff --git a/docs/pr-guide.md b/docs/pr-guide.md index 9074d699186..7e1454b0bf9 100644 --- a/docs/pr-guide.md +++ b/docs/pr-guide.md @@ -27,7 +27,7 @@ Anyone with write access can merge a pull request manually or by setting the [au * The PR successfully builds and passes all tests in the Continuous Integration (CI) system. * Depending on your change, you may need to re-run validation. See [rerunning validation](#rerunning-validation) below. -Please always **squash** the pull request unless there are special circumstances. Do so, even if the PR contains only one commit. It creates a simpler history than a Merge Commit. "Special circumstances" are rare, and typically mean that there are a series of cleanly separated changes that will be too hard to understand if squashed together, or for some reason we want to preserve the ability to bisect them. +Typically, PRs are merged as one commit. It creates a simpler history than a Merge Commit. "Special circumstances" are rare, and typically mean that there are a series of cleanly separated changes that will be too hard to understand if squashed together, or for some reason we want to preserve the ability to bisect them. ## Rerunning Validation |