Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added guide to allow users to receive updates from main rAthena repo to their forked versions in Bitbucket/GitLab (#1828)

Browse Source 
* Added guide to update forked repositories.
This commit is contained in:
Dragonnnn 2016-12-29 04:21:48 +08:00 committed by Aleos
parent 36704f9045
commit 39cc005feb
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -56,6 +56,7 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
* Paste the GitHub URL into the box: * Paste the GitHub URL into the box:
https://github.com/rathena/rathena.git https://github.com/rathena/rathena.git
* Open MySQL Workbench and create an instance to connect to your MySQL Server * Open MySQL Workbench and create an instance to connect to your MySQL Server
* Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE) * Create a database (rathena), a user (rathena), give permissions (GRANT SELECT,INSERT,UPDATE,DELETE)
and then login using the new user and then login using the new user
@ -92,7 +93,27 @@ relevant to your Operation System, please refer to the Wiki (links at the end of
./athena-start start ./athena-start start
* Optional
* If you want to have your own forked version but still get updates from the main rAthena repository
* Fork this repository to your GitHub account
* List the current configured remote repository for your fork:
git remote -v origin
* Specify a new remote upstream repository that will be synced with your fork:
git remote add upstream https://github.com/rathena/rathena.git
* Verify the new upstream repository you've specified for your fork:
git remove-v origin
* You should see the main rAthena repository as well as your forked repository
* Now, when you want to get updates from rAthena, simply do:
git pull upstream master
Remember that rAthena falls under [GNU GPLv3](https://github.com/rathena/rathena/blob/master/LICENSE).
4. Troubleshooting 4. Troubleshooting
--------- ---------