Git branching model tutorial
This page helps you get started with the new branching model.
See issue #701 to switch to the develop branch instead of master.
A: Just take a few minutes to follow this tutorial, the branching/merging concept is an awesome thing you probably want to understand when working with Git.
(Note: This might sound complicated at first, but you won't have to deal with it that much, while it really helps when you're working in big teams!)
A: Most of the time, on the develop 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/xxxbranches. - When fixing a bug present in a realease: the latest release is still available for changes on the
developbranch, and bugfixes should be sent here so that we can release a patched version afterwards. - When working on the
vanillaversion.
Click below to view a nice schema of the branching model:
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!
Making a new major release
TODO
Making a new minor release
TODO
Merging release bugfixes back to develop
TODO
Starting a feature branch
TODO
Merging a feature branch
TODO