Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Last revision Both sides next revision | ||
|
wiki:documentation:devguide:branches_and_tags [2017/07/10 16:51] marisa [Branches] |
wiki:documentation:devguide:branches_and_tags [2018/04/05 11:42] marisa |
||
|---|---|---|---|
| Line 31: | Line 31: | ||
| We have the following branches: | We have the following branches: | ||
| - | * **develop:** This is the branch where the development team is working to add new features to future versions of TerraLib and TerraView. It may be instable although the codebase is subject to automatic tests (regression and unittests). We don't recommend to generate production versions of TerraLib/TerraView from this branch. Use it for testing new features and get involved with TerraLib/TerraView development. | + | * **develop:** This is the branch where the development team is working to add new features to future versions of TerraLib and TerraView. It may be unstable although all updates((merge request in GIT)) are accepted only after building in all platform. We don't recommend to generate production versions of TerraLib/TerraView from this branch. Use it for testing new features and get involved with TerraLib/TerraView development. |
| * **release-5.2:** This is the branch for TerraLib generation //5.2.z//. | * **release-5.2:** This is the branch for TerraLib generation //5.2.z//. | ||
| Line 39: | Line 38: | ||
| * **release-5.0:** This is the branch for TerraLib generation //5.0.z//. | * **release-5.0:** This is the branch for TerraLib generation //5.0.z//. | ||
| + | |||
| + | * **master:** This is the default branch((after //clone// command)). | ||
| + | |||
| In order to switch to one of the branches listed above, use the checkout command and create a local branch to track the remote branch. The syntax of ''git checkout'' is: | In order to switch to one of the branches listed above, use the checkout command and create a local branch to track the remote branch. The syntax of ''git checkout'' is: | ||
