-
Notifications
You must be signed in to change notification settings - Fork 12
Developers Manual
btel edited this page Jan 23, 2013
·
5 revisions
Coding sprints will be organized at least once per release and coordinated on IRC freenonde room #spikesot. If you want to be informed about next sprint, send an email to bartosz telenczuk.
Branches of main repository:
-
master- the most recent stable version of the code -
dev- development code - feature branches - larger features/refactoring should be implemented in feature branch (for example,
new_cool_feature)
All development is done only in dev and never in master.
If you are not current developer and do not have an access to the main repository, you can fork the code and send us pull request that will be reviewed before merging.
Development workflow is similar to the one described in http://nvie.com/posts/a-successful-git-branching-model/ except that we do not use release branches yet.
Do not use git merge unless really necessary. Always prefer rebase (using, for example, git pull --rebase)