GitHub: Switched to master branch

Lincoln

For those interested, we're now doing active development against the 'master' branch instead of the 'unstable' branch. I just synced the branches a moment ago and will be using master from here on out.

We changed to better follow convention and so we can implement a new branching plan to make releases go smoother.

ddumont

Hooray! I still have a pull request on master :)

luc

Will you be following http://nvie.com/posts/a-successful-git-branching-model/ ?

Lincoln

@luc Very similar. I don't see the utility of keeping 'master' stuck at the latest release because so much on GitHub assumes that is the primary dev branch. So the main difference is we're making 'master' the develop branch. We will indeed be branching for point releases (did you notice the 2.0.17 branch appear?) so we can easily issue hotfixes for the last point release or two as needed.

We've already been using feature branches to an extent. I think their model is a little more complicated than necessary but agree with the overall idea.

luc

Indeed, I saw. But I'm a little behind because github rss got stuck when they changed the way the commit appears (which I don't like for the commit message at least).