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. **

Todo:

• How to Fork this repository to create your own version
• 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
• Add nekiro as a remote to your forked repository and run TFS with a downgraded client protocol
• 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