Skip to content

Commit

Permalink
docs/contributions: clarification
Browse files Browse the repository at this point in the history
  • Loading branch information
S-Coyle committed Mar 4, 2020
1 parent 598358b commit a5fa898
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Each PR should be rebased on the latest upstream commit; avoid merging from the

Fixes to review comments should preferably be pushed as additional commits to make it easier for the reviewer to see the changes. As a final step once the reviewer is happy the author should consider squashing these fixes with the relevant commit.

Smaller PRs can have their commits squashed together and fast-forward merged, while larger PRs should probably have the chain of commits left intact and fast-forward merged into the upstream branch. This ensures that the chain of first parents in the main branch is checked by CI, and enables efficient use of `git bisect`.
Smaller PRs can have their commits squashed together and fast-forward merged, while larger PRs should probably have the chain of commits left intact and fast-forward merged into the upstream branch.

Where appropriate, commits should always contain tests for the code in question.

Expand Down Expand Up @@ -126,4 +126,4 @@ Contributors and users can get support through the following official channels:
* GitHub issues: Log an issue in the repository where you require support.
* [SAFE Network Forum](https://safenetforum.org/): Join our community forum, say hi, and discuss your support needs and questions with likeminded people.
* [SAFE Dev Forum](https://forum.safedev.org/): Need to get technical with other developers? Join our developer forum and post your thoughts and questions.
* [SAFE Network chat rooms](https://safenetforum.org/t/safe-network-chat-rooms/26070): The General chat room is a good place to ask for help. There is also a Development chat room for more technical discussion.
* [SAFE Network chat rooms](https://safenetforum.org/t/safe-network-chat-rooms/26070): The General chat room is a good place to ask for help. There is also a Development chat room for more technical discussion.

0 comments on commit a5fa898

Please sign in to comment.