|
|
| (41 intermediate revisions by 5 users not shown) |
| Line 1: |
Line 1: |
| − | {{ScoutPage}}
| + | We are now on GitHub! You'll find the new contribution guide here: https://github.com/eclipse-scout/scout.rt#contributing |
| − | | + | |
| − | == Introduction ==
| + | |
| − | | + | |
| − | TODO
| + | |
| − | | + | |
| − | == Git Branching Policy ==
| + | |
| − | | + | |
| − | The following table describes the branching policy used for the Eclipse Scout Git Repositories (http://git.eclipse.org/c/scout/).
| + | |
| − | | + | |
| − | {|border="1" cellpadding="5" cellspacing="0"
| + | |
| − | |-
| + | |
| − | ! scope="col" style="background:#efefef;" | Branch
| + | |
| − | ! scope="col" style="background:#efefef;" | Usage
| + | |
| − | |-
| + | |
| − | | develop
| + | |
| − | | Contains the very latest sources. This branch is used for building the nightly version and contains the development of the newest features that usually will be available to the next stable release.
| + | |
| − | |-
| + | |
| − | | master
| + | |
| − | | Contains the sources of the latest stable release. This is equal to the sources for the features found in the P2 updatesite http://download.eclipse.org/scout/releases
| + | |
| − | |-
| + | |
| − | | release/<release_name>
| + | |
| − | | Contains the development for the corresponding releases. So e.g. a release branch named luna_sr1 contains the fixes for the Luna service release 1. These branches will be merged into the master and develop branches as soon as the corresponding release is shipped. Afterwards the branch is deleted and the merge into the master branch is tagged.
| + | |
| − | |-
| + | |
| − | | sandbox/<developer_user_name>/<feature>
| + | |
| − | | Contains developer private feature branches that contain the developments of new features. As soon as the feature development is complete, this branch is merged into the develop branch and the feature branch is deleted.
| + | |
| − | |-
| + | |
| − | | hotfix/<hotfix_name>
| + | |
| − | | Contains branches in which hotfixes for a release are developed. After the hotfix development is complete, the hotfix branch is merged into the develop and the master branch. Then the master branch is tagged and the hotfix branch is deleted.
| + | |
| − | |}
| + | |
| − | | + | |
| − | == Git Repositories and current Branches ==
| + | |
| − | | + | |
| − | Please see http://wiki.eclipse.org/Scout/Contribution#Getting_the_Scout_Sources.
| + | |
Latest revision as of 05:33, 18 August 2021
We are now on GitHub! You'll find the new contribution guide here: https://github.com/eclipse-scout/scout.rt#contributing
