github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-03 00:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

update contribution guide (#931)

Browse Source
This commit is contained in:
Ran Luo 2019-04-13 21:00:19 +08:00 committed by Felix Häusler
parent 99848431bd
commit d1aefbde47
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View File

@ -17,7 +17,7 @@ Please search for similar issues before opening an issue and always follow the [
## Pull Request Guidelines ## Pull Request Guidelines
- Submit PRs directly to the `master` branch. - Submit PRs directly to the `develop` branch.
- Work in the `src` folder and **DO NOT** checkin `dist` in commits. - Work in the `src` folder and **DO NOT** checkin `dist` in commits.
@ -56,14 +56,14 @@ Other ways to help:
2. Clone your fork: `git clone git@github.com:<username>/marktext.git` 2. Clone your fork: `git clone git@github.com:<username>/marktext.git`
3. Create a feature branch: `git checkout -b feature` 3. Create a feature branch: `git checkout -b feature`
4. Make you changes and push your branch. 4. Make you changes and push your branch.
5. Create a PR against `master` and describe your changes. 5. Create a PR against `develop` and describe your changes.
**Rebase your PR:** **Rebase your PR:**
If there are conflicts or you want to update your local branch, please do the following: If there are conflicts or you want to update your local branch, please do the following:
1. `git fetch upstream` 1. `git fetch upstream`
2. `git rebase upstream/master` 2. `git rebase upstream/develop`
3. Please [resolve](https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/) all conflicts and force push your feature branch: `git push -f` 3. Please [resolve](https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/) all conflicts and force push your feature branch: `git push -f`
### Build Instructions ### Build Instructions