TODO: Add accurate description & references (papers, etc)
We have two main branches, master and develop.
For every new feature we create a new branch in the following form:
git checkout -b new_featureAfter we are done developing, we test, and make a pull request to the develop branch via the Github UI. If there are merging conflicts, git will detect them and will not allow the branches to merge. We resolve the conflicts in the following way:
git merge --no-commit --no-ff -s recursive -X patience origin/developAfter the conflicts are resolved:
git commit -v
git push origin new_featureWhen we are absolutely sure that no changes will break the master branch, we publish.
Related documentation:
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
TODO: Add modules