Changes between Version 2 and Version 3 of UfoRevisionControl


Ignore:
Timestamp:
Feb 19, 2011, 2:28:45 PM (14 years ago)
Author:
Matthias Vogelgesang
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UfoRevisionControl

    v2 v3  
    5959
    6060In the future we should streamline the development process as shown in the blog post: There are named branches with specific purposes, which may or may not branch from each other in order to form a coherent system. The two main branches are `master` where one commit means a release of the product and `develop` where actual development happens. `develop` branches from `master` and from there everyone in the personal branches. Release and feature branches are tempory branches to aid in preparing the release and to help organizing the development of new features. They are deleted when changes in these branches are merged back to `master` and `develop` respectively.
     61
     62The complete system can be seen in the following illustration:
     63
     64[[Image(branch-model.png)]]