Make sure when you read this, open this photo album, source How to fork rAthena?
You must have GitHub account.
Open rAthena repo on github: https://github.com/rathena/rathena
On top right-corner, you will see "Fork" button, click it (Pic. 0.jpg)
Then choose your account to place for forked rAthena. (That pic, mine, show @cydh and @rathena because I had been invited to rAthena repo itself) (Pic. 1.jpg)
Well it's done!
Clone your forked rAthena: Here for Windows user, I used SmartGit.
Project -> Clone
Input the Repository URL, it should be https://github.com/<yourusername>/rathena (Pic. 2.jpg)
Just "Next" (Pic. 3.jpg)
Choose your local directory (Pic. 4.jpg)
GIve the Project Name (Pic. 5.jpg)
Well it clone your forked rAthena, just wait (Pic. 6.jpg)
How to update my forked rAthena? First, you need make sure your forked repo is up-to-date with rAthena repo. For this steps, use this source images (Step: 1~8, only for the first time)
Click Remote menu -> Add.. Fill the URL or Path with https://github.com/rathena/rathena and give the name "rAthena" (1.jpg)
After the remote repo is created, right-click it -> Fetch More... (2.jpg)
Choose the master branch. (3.jpg)
If any changes, it will fetch them. (4.jpg)
Make sure your active branch is your local master.
Right-click on the master branch of rAthena remote, choose Merge (5.jpg)
Click Fast-Forward (6.jpg)
Well, is it already up to date? (7.jpg) If yes, do nothing.
Make sure your active branch is your local master.
For another day maybe, you can simply right-click on rAthena remote choose Pull (10.jpg)
Click Fetch Only (11.jpg), and wait until it done (12.jpg)
Then you need merge it to your local, right-click on master branch of rAthena remote, choose Merge... (13.jpg)
Fast-Forward (14.jpg) (Only if your local doesn't have conflict it the 'incoming' fetch, if there is conflict, it will be Create "Merge Commit" and you should solve the conflict)
And you will get this log (something like this) (15.jpg) That's mean, it's done
Push them to your repo on GitHub! Just click Push (16.jpg), then just choose the branch master only (17.jpg)
Wait it, and see the changes when it's done. (18.jpg)
Before make Pull Request (PR)
Better you make new branch, keep master branch SAME with rAthena master branch. Why? - It won't disturb your or rAthena master branch - 1 branch 1 PR, so you can make many PR for each branch. - Merged/closed/rejected branch can be deleted, so if your PR from non-master branch is rejected, your master branch still same, you can make PR again later without your prev. rejected branch disturb your next PR. - Make new branch on your github, just go to your fork, the type branch name, if the branch isn't exist, it will offers to make new one, example "test" branch, then pull your repo first. - See this guide how to do it!
How to do Pull Request? (Back to this album again)Edit the file you want (make sure everything is correct and working properly)
Open your SmartGit, open the project.
Make/switch branch, Branch menu > Add Branch (F7), name it as "test" for example.
(Better you click the "Directories" first on the left, then) Click "Commit" button
A Commit window will appears, (choose the file taht you want to commit & push)
Give commit message. Then click "Commit & Push" (Pic. 7.jpg)
Wait until it done! (Pic. 8.jpg)
Here is it, do a Pull Request!
Open your browser and open your forked repo (mine is http://github.com/cydh/rathena)
Then click "compare" (pic. 9.jpg) or you can use
https://github.com/<username>/<rathena fork name>/compare/rathena:master...<branch name>
Click "Click to create a pull request for this comparison" (pic. 10.jpg)
Give some messages, then click "Send pull request" (pic. 11.jpg)
Done.