diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65cab13116..e0349f7970 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,9 +84,7 @@ Once you are ready with your changes, don't forget to [self review](/contributin - Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge. - Once you submit your PR, one of the writers would review your proposal. Keep an eye for any questions or request for additional information. - We may ask for changes to be made before a PR can be merged, either using [suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request) or pull request comments. You can apply suggested changes directly through the UI. You can make any other changes in your fork, then commit them to your branch. - - As you update your PR and apply changes, mark each conversation as [resolved](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/commenting-on-a-pull-request#resolving-conversations). -- After that, we may have questions, check back on your PR to keep up with the conversation. - If you run into any merge issues, checkout this [git tutorial](https://lab.github.com/githubtraining/managing-merge-conflicts) to help you resolve merge conflicts and other issues. ### Your PR is merged! @@ -106,4 +104,4 @@ This site can be developed on Windows, however a few potential gotchas need to b 1. Filename too long error: There is a 260 character limit for a filename when Git is compiled with `msys`. While the suggestions below are not guaranteed to work and could possibly cause other issues, a few workarounds include: - Shorten the path by cloning this repo directly into `C:\` - Use a different Git client on Windows - - Update Git configuration: `git config --system core.longpaths true` \ No newline at end of file + - Update Git configuration: `git config --system core.longpaths true`