Skip to content
Vasily Makarov edited this page Jan 30, 2015 · 1 revision

Iteration is a section of git history in which all branches are started from same commit in master (named “iteration base”). Starting new iteration is like declaring that all new topics should be based on topics merged into master at this point. Each iteration includes two special branches - “develop” (for sharing development results) and “staging” (used by maintainer to accept topic-branches). Iterations don't overlap, i.e., user cannot merge a branch started from Iteraion1 based into any branch of Iteraton2. Any commits between Iteration1 base and Iteration2 base including Iteration2 base belong to Iteration1.

Iterations are started via git-aflow rebase command.

Clone this wiki locally