Skip to content
msakuta edited this page Sep 12, 2014 · 1 revision

Welcome to the VastSpace wiki!

Branch Management

The main development branches of VastSpace is master, next and next2.

Fixed feature branch. It won't be rebased or filter-branched (easily). It tend to go behind next or next2 branches for about a month.

Experimental feature branch. It's unstable and frequently rebased or even filter-branched, but it should go ahead of master. If you track this branch, you may see this branch does not proceed in linear history and successive git pulls result in strange merges. In such a case, just git reset --h to latest next2. It's so unstable that sometimes be even unable to build.

The repository of Git itself has a similar branch named pu.

Commit of somewhere between master and next2.

Clone this wiki locally