Branching Model

Branching Model

Basic overview of the branches that we use on this project.

Main Branches

These are branches that form the center of the pipeline.

master

This branch is where everything that is stable goes. Master builds, runs and is generally well tested.

upcoming

Most active development occurs here. All other feature branches are eventually merged into upcoming for testing and polish.

Feature Branches

These branches are where large changes to the overall structure or functionality of the project take place. Smaller things, such as bug fixes or other small non-breaking changes, are pushed directly to upcoming. Something like a large refactor of the game code or a port of the engine to Linux, all belong in feature branches.

dx11

All work on the DX11 shaderapi happens on this branch.

posix-support

All work on the Linux/BSD port of the engine happens here. This branch is usually very unstable.

x64

All work on the AMD64 port of the engine happens here. This branch is also unstable.

Other Branches

dev

This branch is deprecated currently. Do not use it.

Visualization

posix-support 
           \ 
>-----development------> [upcoming] >-------fixes & improvements--------> [master]
    /      /
dx11    x64