Developer Git Workflow

Get Started

Start by cloning the server git repository.

git clone [email protected]:opentibia/server.git

This will check out master (revscriptsys).

git add <files>
git commit

Will create a commit, make sure to format commits according to the Commit Message Guidelines.

To push your changes upstream to the central repository, you must first pull down remote changes, for this use git pull.

git pull

This will pull down the remote changes and merge them, if there are any merge conflicts, the git manual has a good guide on how to resolve it.

Once the pull has completed, you can push your changes back to github using:

git push

This will publish your changes on github. Yay!

Working on Legacy

If you want to work on the legacy branch of OT (ie. 0.6.3~), check out the legacy branch.

git checkout legacy

Will switch you over to the legacy branch, you can now make changes etc. The workflow is the same as working on master, use git add and git commit to create your commits, when you are ready to publish the commits use git pull / git push.

If you want to move back to the master branch, just do:

git checkout master