Skip to content

Commit

Permalink
Merge pull request #159 from davfsa/task/fix-contributing
Browse files Browse the repository at this point in the history
Fix CONTRIBUTING.md to remove references to dead branches
  • Loading branch information
Nekokatt authored Sep 11, 2020
2 parents c8ea005 + 897506b commit c9c6640
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ To push branches directly to the remote, you will have to name them like this:
- `task/issue-number-small-info-on-branch`
- This should be the default for any commit that doesnt fall in any of the cases under.
- `feature/issue-number-small-info-on-branch`
- This should be used for branches that require more tasks to merge into before going as one MR into `development`.
- This should be used for branches that require more tasks to merge into before going as one MR into `master`.
- `bugfix/issue-number-small-info-on-branch`
- This should be used for bugfixes.

Expand Down Expand Up @@ -41,12 +41,12 @@ This includes:
- `safety`
- Vulnerability checking.
- `twemoji-mapping`
- Force test all discord emojis (will only run when a file regarding emojis has been changed).
- Force test all discord emojis.
- `pdoc3`
- Generate documentation.
- `pages`
- Generate final documentation.
- `deploy`
- Deployment to pypi (will only run on `staging` and `master`).
- Deployment to PyPI (will `master`).

All jobs will need to succeed before anything gets merged.

0 comments on commit c9c6640

Please sign in to comment.