You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Bertrand Putigny edited this page Jan 30, 2015
·
1 revision
Workflow
The master branch stores official ESTER's releases. Every release is tagged in the master branch.
The dev branch is the branch to use to push commits between releases.
Modifying the Code
If you want to contribute, please feel free to clone the repository and either send patches by email to ester-dev@irap.omp.eu or submit pull requests with github.
Remember that you should fork off of the dev branch to ease merging your features into the next release.
Releasing
As said earlier, new releases should go to the master branch. When the dev branch is mature enough to be released:
Freeze the current version by creating a branch called release-x.y.z where x.y.z is the release number (e.g., 1.1.0).
Checkout this branch and edit VERSION to set greek to rc1.
Checkout dev and update VERSION to the next version by increasing one of the major, minor or release number.
Once release-x.y.z is ready to be released:
edit VERSION and set greek the empty string
merge it into the master branch
tag the current HEAD with the corresponding version (e.g., v1.1.1)
you also should merge release-x.y.z into dev to integrate changes made in this branch, but be careful not to change VERSION in dev