Picture of Matt Leathes
Changing to 'github flow' for the framework repositories
by Matt Leathes - Thursday, 29 October 2015, 10:11 AM
 

Just to update everyone on the outcome of something we've been discussing on the group chat and weekly calls: a change to the way we use github.

Up to this point we've been working on github using a process called git flow. The tl;dr is: you have two main branches - master and develop. Bug/hotfixes are created as new branches which then have to be merged into both those main branches. New features are also developed as branches but then merged into develop only, and then at some point everything is merged into master and released.

This process has started to feel quite cumbersome and the general consensus of opinion is that it is slowing us down and preventing us from making updates to the framework and plugins as often as we'd like, particularly where we're mostly working with people's donated time.

We've therefore decided to do away with the develop branch altogether and instead follow the github flow process. This should allow us to get new features and fixes in much quicker than we have been doing - and also make it easier for people to contribute code back.

We'll be going through all the repositories starting today, pushing develop into master. If, at that point, there are no outstanding pull requests against the develop branch, it will be deleted.