GIT Collaboration
The Forgotten Server (abbr. TFS) is an open source collaboration project, we have quite an extensive git network of contributors here on GitHub. We use Issue Tracking to identify and confirm issues and potential enhancements, and Pull requests as a sane way to streamline updates and patches to our main repository otland/forgottenserver.
**This WIKI page is work in progress. **
Login on github.com, visit visit otland/forgottenserver and click on the Fork button:
It should then create your own fork of the repository where you have full edit access:
This is important because your repository now recognizes otland/forgottenserver and makes you a part of their git collaboration network:
Your Fork now has its own github repository URL, which is important when using git commands later in this guide.
You can find your own Forked repository here:
Todo:
- Table of contents with anchor links
- [WIP] How to Fork this repository to create your own version
- [WIP] How to set up your development environment with your Fork
- How to create your own branch with your own modifications
- Add otland as a remote to your forked repository and keep your fork up to date by syncing with otland
- What actually happens when somebody opens a pull request?
- How to properly create your own Pull Request
- How to update your pull request
- How to properly test other Pull Requests by adding them as a remote and checking out their branch
- How to collaborate on a pull request by sending commit to an existing Pull request
- Live on the bleeding edge by merging multiple experimental pull requests into a branch in your own fork and run it
- How to solve and merge git conflicts
- Add nekiro as a remote to your forked repository and run TFS with a downgraded client protocol