We'd love for you to contribute to our source code and to make OpenRSC even better than it is today! Here are the guidelines we'd like you to follow:
Before you submit your merge request consider the following guidelines:
Make your changes in a new git branch:
git checkout -b my-fix-branch develop
Create your patch commit.
Commit your changes using a descriptive commit message.
git commit -a
Note: the optional commit -a
command line option will automatically "add" and "rm" edited files.
Push your branch to GitLab:
git push origin my-fix-branch
In GitLab, send a merge request to Game
.
If we suggest changes, then:
my-fix-branch
).You can also amend the initial commits and force push them to the branch.
git rebase develop -i
git push origin my-fix-branch -f
This is generally easier to follow, but separate commits are useful if the Merge Request contains iterations that might be interesting to see side-by-side.
After your merge request is merged, you can safely delete your branch and merge the changes from the main (upstream) repository:
Delete the remote branch on GitLab either through the GitLab web UI or your local shell as follows:
git push origin --delete my-fix-branch
Check out the develop branch:
git checkout develop -f
Delete the local branch:
git branch -D my-fix-branch
Update your develop with the latest upstream version:
git pull --ff upstream develop
IntelliJ IDEA Community https://www.jetbrains.com/idea/download/
Git Fork https://git-fork.com/
MariaDB https://mariadb.org/download/
Sublime Text Editor https://www.sublimetext.com/
You will need to either use the set up script for Windows or Linux/Mac that comes in the repository or do it all manually.
If you choose to install everything manually and not use the set up scripts, the following are required to be installed to ensure we are all using the same development environment tools:
MariaDB, OpenJDK, PHPMyAdmin, NGINX or Apache web server, PHP, Git Fork or git