Skip to content

Commit 03440e5

Browse files
authored
Merge pull request #20 from ViTeXFTW/docs/github
Update GitHub documentation
2 parents b2587e7 + 6c9364c commit 03440e5

File tree

5 files changed

+80
-4
lines changed

5 files changed

+80
-4
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Why
2+
- Tell why the PR has been made
3+
4+
# Changes
5+
- What has been changed, as much detail as possible
6+
7+
# Issues
8+
- What issues are this addressing

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
# Project related files
12
TODO.txt
23
out
4+
5+
# Node files
36
node_modules
4-
client/server
7+
8+
# Vscode files
59
.vscode-test
6-
.vscode
710
**/*.js.ma

.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,12 @@
44
"typescript.preferences.quoteStyle": "single",
55
"editor.codeActionsOnSave": {
66
"source.fixAll.eslint": "explicit"
7+
},
8+
"[markdown]": {
9+
"editor.quickSuggestions": {
10+
"other": true,
11+
"comments": true,
12+
"strings": true
13+
}
714
}
815
}

CONTRIBUTING

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
First of all, thank you for taking an interest.
2+
3+
# Introduction
4+
Please take some time to read and understand this file. This will help keep the project clean and transparent for all contributors. It will also make it easier for admins and moderators to merge your code suggestions.
5+
6+
# Forks
7+
The first part is to create your own fork of the project. You can do this directly from GitHub by pressing the fork button in the top right corner. This will create a copy of the repository on your account. In this repository you can do whatever you want without it affecting the original repository. As long as you adhere to the following rules when branching and creating pull requests (PR).
8+
9+
# Branches
10+
When creating a new branch please adhere to the following guidelines:
11+
- The branch should match one of the below
12+
- The branch "sections" are seperated with "/" (slash)
13+
- The branch name is lowercase
14+
15+
## Issue fixing branch
16+
If the branch you are creating fixes an issue please name the branch:
17+
`issue/(Issue #)/(GitHub name)`
18+
19+
This signals that the branch is trying to fix a known issue.
20+
21+
## Feature branch
22+
If you would like to add a new feature that you feel is missing. Please create a feature-request issue on the original repository, this way a issue number gets created. Then create the branch with the name:
23+
`feature/(Issue #)/(GitHub name)`
24+
25+
## Examples
26+
27+
**Issue:**
28+
`issue/18/vitexftw`
29+
30+
**Feature:**
31+
`feature/22/Mads`
32+
33+
# Commit messages
34+
Commit messages should be consice and descriptive. They should specify what section was changed.
35+
Please prefix your commit messeage with one of the following.
36+
37+
| Prefix | Description |
38+
|:------------|:---------------------------|
39+
| fix: | Fixes a GitHub issue |
40+
| feat: | Adds new feature |
41+
| doc: | Document code/github |
42+
| refactor: | Rewritten code (no effect) |
43+
44+
### Example
45+
See commit messeage for this PR [#17](https://github.com/ViTeXFTW/ZeroSyntax-Server/pull/17)
46+
"Fix: [BUG] Incorrect error in WeaponSet Weapon property #14"
47+
48+
# Pull Requests (PR)
49+
For PRs please use the attached [PR Template](./.github/PULL_REQUEST_TEMPLATE/pull_request_template.md)
50+
51+
### Example
52+
See commit messeage for this PR [#17](https://github.com/ViTeXFTW/ZeroSyntax-Server/pull/17)
53+
54+
# Merges
55+
Merges are only approved by the admin (ViTeXFTW), and will be done when the PR has been reviewed and tested.
56+
57+
# License
58+
By contributing you agree that your code will be licensed under the [LICENSE](./LICENSE) file in the root directory of this source tree.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ The server supports context based code completion. This is done by analyzing the
4444

4545

4646
## Contributing
47-
For contributing you will need to fork the repository, create your own branch make and test any changes you feel is missing from the project and create a pull request. I will then take a look at the code changes and merge the code if everything is in order.
47+
See [CONTRIBUTIN](CONTRIBUTING)
4848

4949
## Licsens
5050
This projct is under the MIT [LICENSE](LICENSE)
5151

5252
## Sugestions
53-
As this is my first open-source project, if you have any ideas or suggestions please write to me on eithre Discord or mail. (Discord might be better)
53+
As this is my first open-source project, if you have any ideas or suggestions please write to me on either Discord or mail. (Discord might be better)
5454

5555
## Questions
5656
Discord: ViTeXFTW#6644

0 commit comments

Comments
 (0)