Back to Wiki Homepage

Secretchronicles Wiki

Merging from a release branch to devel

At any given time we will several branches with which we are working.

  • Master branches correspond to major releases that are finished and bug tested.
  • Releases branches correspond to efforts to complete a release, freezing features in the code to prevent further bugs.
  • Devel (short for development) is where anyone can come to continue developing new features at an time.
  • Additional branches may be added to correspond to major series of releases, each corresponding to features that break compatibility with levels/worlds in older versions.

This document describes how to merge changes from one branch into another. It gives the merge from release-2.0.0 to devel as an example but can be applied to other branches.