ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 17:42:20 +03:00
Code Issues Projects Releases Wiki Activity

Contributing: Minor grammar/punctuation

Browse Source
This commit is contained in:
Athanasius 2021-06-07 12:11:58 +01:00
parent 54b57db329
commit 9dcb79a5db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Contributing.md
View File

@ -142,13 +142,13 @@ In all cases the branch should be named as per the scheme `<class>/<issue number
succinct for `<title>`, it's just there for easy reference, it doesn't need to be the entire title of succinct for `<title>`, it's just there for easy reference, it doesn't need to be the entire title of
the appropriate issue. the appropriate issue.
Which branch you base your work on will depend on which class of WIP it is. If you're fixing a bug in the latest The branch you base your work on will depend on which class of WIP it is. If you're fixing a bug in the latest
`stable` then it's best to base your branch on its HEAD. If it's a fix for a beta release then base off of `beta`'s `stable` then it's best to base your branch on its HEAD. If it's a fix for a beta release then base off of `beta`'s
HEAD. If you're working on a new feature then you'd want to base the work on `develop`'s HEAD. HEAD. If you're working on a new feature then you'd want to base the work on `develop`'s HEAD.
**Important**: Please *under no circumstance* merge *from* the source branch after you have started work in **Important**: Please *under no circumstance* merge *from* the source branch after you have started work in
your WIP branch. If there are any non-trivial conflicts when we merge your Pull Request then we might ask you your WIP branch. If there are any non-trivial conflicts when we merge your Pull Request then we might ask you
to rebase your WIP branch on the latest version of the source branch. Otherwise we'll work out how to best to *rebase* your WIP branch on the latest version of the source branch. Otherwise, we'll work out how to best
merge your changes via comments in the Pull Request. merge your changes via comments in the Pull Request.
## Linting ## Linting