Branching model mismatch

[Víctor López Juan]

It seems that the branching model that we are using in practice does not correspond to the model that we link to in the project overview:

http://nvie.com/posts/a-successful-git-branching-model/

In this branching model, the changes in the master branch are always a subset of the changes in the develop branch. By contrast, in our repo, some bug fixes are applied to master but not to develop.

This becomes more visible now that continuous integration (CI) is enabled, and the build status of the develop branch displayed prominently in the repository's overview. Because some bug-fixes are not applied to develop, the status will sometimes be shown as broken, even when the bugs responsible for that broken status have already been fixed in master. This is confusing.

One solution is to show the CI state of master instead of develop in the project overview.

However, I think that applying all bug-fixes to both develop and master is a better idea. If both branches build successfully, we will have the assurance that the new features that we have added do not break existing ones. And finding the cause of bugs in develop before a release will be easier.

[Víctor López Juan]

Some notes:

• If we apply solution 1, we should see whether what we do really differs from the branching model, and if so, document it somewhere (perhaps even removing the link to http://nvie.com/posts/a-successful-git-branching-model/ if what we do is too different.

• Applying solution 2 means, in practice, that whenever we fix a bug in master, we also git-merge master onto develop.