Git branching model tutorial

Getting started FAQ

Q: Branching? WTF?

A: Just take a few minutes to follow this tutorial, the branching/merging concept is an awesome thing you probably want to master when working with Git.

(Note: This might sound complicated at first, but you'll soon get used to it, plus it really helps when you're working in big teams!)

Q: Where am I supposed to commit things?

A: Most of the time, on the developer branch. The few exceptions are:

• When working on a specific big feature: each important addition/refactoring (like the "Campaign mode") are develop in specific feature/xxx branches.
• When fixing a bug present in a realease: the latest release is still available for changes on the develop branch, and bugfixes should be sent here so that we can release a patched version afterwards.
• When working on the vanilla version.

Q: Ok, so how do I choose a branch/merge a branch/cancel a merge?

A: Take a quick look at the tutorial I linked above, you'll probably find your answer there. If this doesn't help, links to the forum/IRC channel are available here, you'll probably find someone who can help!

Common situations

Releases

Making a new major release

TODO

Making a new minor release

TODO

Merging release bugfixes back to develop

TODO

Feature branches

Starting a feature branch

TODO

Merging a feature branch

TODO