Fork & Pull Request on rAthena
>>>> Fork & Make New Pull Request <<<<
>>>> How to update your fork <<<<
Introducing (a short guide to) GitHub Pull Requests
Submitting a Pull Request
1. Once you've commited and squashed your changes, push them to your remote like this:
git push origin newfeature
2. Then go to that page on GitHub and change branches to the one for your new feature.
Submit a Pull Request!
3. Then, click on the little button that says 'Pull Request'. This will bring you to a page asking you to describe your change. Describe it thoroughly.
Describe your Pull Request.
4. Then press 'Submit Pull Request'.
Now, you're not quite done yet. If the maintainer finds some problems with your code, they won't want to pull your changes until you fix them. Fortunately, whenever you commit and push more things to that branch of your code, they will be included in that pull request until it is closed.
Accepting And Merging a Pull Request
If you're on the receiving end of a pull request, how do you merge the changes?
Easy - press the button! GitHub now has an auto-merge button which does everything for you in one click. However, it doesn't always work, in which case you'll have to do the merge on your own machine, like so:
And then their changes will be properly merged into your main master branch.
So, Your Pull Request Was Rejected. Now What?
Some forks are unavoidable.
Sometimes, for technical or organizational reasons, your pull request will be rejected. This can feel really frustrating, and there are a few different ways you can proceed. Just remember to act rationally.
The simplest thing is to simply accept their judgement. It's their project, and a good maintainer knows when to say "no." If their argument is logically sound, you should accept it. If you don't think it's a particularly important feature, hopefully whoever is looking at the project will check the Network and Issues tabs of the upstream project and will notice your changes.
Easy to follow video
http://www.youtube.com/watch?v=-CpllxXPsvw
ELI5
http://www.youtube.com/watch?v=4ocbq8vx4vI
Other Resources
https://help.github.com/articles/using-pull-requests
Original Article
If you have any questions, please feel free to ask! We will try and assist you as best as we can. Users who are knowledgeable with GitHub Pull Requests are also welcome to help!