prithvi2k2 / Neil.js Public

forked from NGIT-Open-Source/Neil.js

Notifications You must be signed in to change notification settings
Fork 0
Star 0

Official Bot for NGIT Discord Server

0 stars 10 forks Branches Tags Activity

Name		Name	Last commit message	Last commit date
Latest commit History 67 Commits
.github/workflows		.github/workflows
commands		commands
docs		docs
events		events
.dockerignore		.dockerignore
.env.example		.env.example
.eslintrc.json		.eslintrc.json
.gitignore		.gitignore
Dockerfile		Dockerfile
README.md		README.md
deploy-commands.js		deploy-commands.js
index.js		index.js
package-lock.json		package-lock.json
package.json		package.json
server.js		server.js

Repository files navigation

Neil.js Discord Bot

Branching in this project

This sections aims at describing all the branches to best possible extinct (Assuming you know how branches work generally in git)

Branches in NGITOSS/discord-bot

main : The main branch is the branch the which will probably be used for deployment as has the production code on it in which everything is bug-free and is working
develop : The develop branch is the branch on which current development goes on and all the PR's are merged here so make sure you are pushing to the right branch when you are making the PR .(Details discussed later).

Branches in your GitHub Repository (The forked Repo)

main : A copy of the main branch in your own repository .
DO NOT COMMIT DIRECTLY TO MAIN
develop : A copy of the main branch in your repository .
This must be kept up to date..
This is the branch you will merge your code into
<working-branch> : Working branch is the branch that you actually work on.
Meaning this branches off of the develop branch and you do actual work on this branch.
Once you finish implementing a feature or resolving a bug you must make a commit on this branch and then merge it with the develop branch.
Then make a PR with this branch to main repo like
username/discord-bot :: develop branch ==> NGITOSS/discord-bot :: develop branch

Contributions

Checkout CONTRIBUTIONS.md for details on contributing to this project