Skip to content

Branch descriptions

nmounet edited this page Oct 11, 2017 · 22 revisions

master

The stable code - for users.

develop

The main development branch. Pull requests from forks/branches should be made into this branch which will be checked by Travis-CI as a condition of merging.

workflows

Updating workflows engine to use plumpy and apricotpy. Currently Martin and Sebastiaan working on this.

fix_importexport

This is the working branch to fix a range of related issues #679, #685, #686, #687 and #688 with the import export functionality. We want these issues to be fixed in individual pull requests (makes it easier to backport in retrospect when necessary) but all fixes need to be tested in conjunction before merging into develop. Therefore the fix_importexport branch will be used for the pull requests of the mentioned issue.