Skip to content

Commit 7b9efbf

Browse files
authored
Merge pull request #37 from jorge-campo/updates-to-contributing-and-readme-files
Minor changes to README and CONTRIBUTING files
2 parents c18d6b9 + 61355e9 commit 7b9efbf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To understand how a repository fork works, see [About forks](https://docs.github
7878

7979
1. Update your local `develop` branch with the latest changes from `upstream`:
8080

81-
`git pull upstream develop`
81+
`git pull upstream develop --rebase`
8282

8383
`git push origin develop`
8484

@@ -163,7 +163,7 @@ With the Mkdocs live preview server, you can preview your changes as you write y
163163

164164
### 7. What's next?
165165

166-
1. 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.
167-
1. 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).
166+
- 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.
167+
- 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).
168168

169169
Congratulations on making it this far! The Status team thanks you.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![Status Help illustration](./overrides/assets/images/status-help-image.png)
44

5-
This repository contains the documentation website code and Markdown source files for [help.status.im](https://help.status.im).
5+
This repository contains the documentation website code and Markdown files for [help.status.im](https://help.status.im).
66

77
We use [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) to build the user documentation site.
88

0 commit comments

Comments
 (0)