#BZFLAG IRC UPDATE#
#BZFLAG IRC FREE#

There are various sites with tutorials and information about using Git: GitHub has some documentation and guides for forking GitHub repositories: If there are any conflicts, you must resolve those.Rebase your branch against the branch it is based on.Checkout your branch you wish to merge changes into.

#BZFLAG IRC UPDATE#

Checkout the branch name matching the upstream branch you would like to update.

If you are working with another base branch, such as 2.4, or you want to update multiple branches in your fork, adjust as necessary. The branches master and feature/betterui below are examples, with feature/betterui being a branch off of master. The steps below will allow you to update your fork and bring in any new changes. GitHub provides a page that talks about pull requests.Īs new changes are pushed to the official BZFlag project repositories, your fork will become outdated. After creating a pull request, you can continue to push new changes to your branch and this will update the changes on the PR. For this, you would create a pull request (known as a PR) on GitHub.

You can repeat the process of editing files, committing, and pushing until you are ready to submit your changes back to the official repository.

Once you have one or more commits applied to your branch, you can push these changes back up to your fork on GitHub.

An editor will appear where you can write a message that describes the changes you have made.

Once you have some changes staged, you can commit those changes to your local clone.

Now make changes to files and then git add FilesYouModified to stage the changes.

Create and checkout that new branch with: For instance, if you were trying to add an improved user interface, your branch could be called feature/betterui. Instead, create your own topic branch that describes the change you are trying to make.

Do not work directly in the branches that the official repository has created (such as 2.4 or master).

Next, check out the upstream branch you are intending to submit changes to.

In order to later merge changes from our official repository, add an upstream remote:.

You will be working from within the bzflag directory from now on.

Now that you have a fork of our code, you need to clone it to your computer so you can work on it.

Sign in to your GitHub account, go to our GitHub repository, and click the Fork button. You can use this same fork for later changes.

You will need to fork our GitHub repository the first time you want to contribute changes.

The example below assumes you want to contribute to the master branch and creates a new topic branch called feature/betterui in your fork. This will allow you to work on multiple independent changes at the same time, keeping them in separate 'topic branches'. With Git and GitHub, contributing to a project is reasonably easy, but we'll try to walk you through best practices. You will find all our official projects at our GitHub organization page. There are also separate repositories and issue trackers for the other related projects such as our websites. Otherwise, you can post the issue to our BZFlag project issue tracker on GitHub.

#BZFLAG IRC FREE#

If you are unsure of the source of the problem, feel free to discuss the problem on our development/support IRC channel at #bzflag on the network or on our public forums. If you find a problem with the game you can report it to our development team.

Bzflag irc