simplify branching strategy

[davidchambers]

simplify branching strategy

[huafu]

I was just following git flow, where develop is the current development branch where everything get merged, and then when we are ready for a release, we merge develop into master, create a tag out of it, and merge back master into develop. This to ensure that master is nothing else but the last release.

Tho if you think it's simpler having only master it's up to you since for now you'll be the one dealing with it. I guess we can always come back to git flow later if needed anyway. In that case don't forget to put master as the default branch in repo settings ;-)

Thanks again for your work on this!

[davidchambers]

Thanks for responding so quickly, Huafu.

Tasks:

1. Merge develop into master, locally
2. Push local master to remote
3. Change base branch of #27 from develop to master
4. Rebase #27 atop master
5. Change base branch of #22 from develop to master
6. Change default branch to master in repository settings
7. Delete develop

I don't have access to the repository settings. Please either grant me access or change the default branch yourself. :)

[huafu]

I try to look at GitHub notifications every day since I gave you access, for the help you're giving I must at least respond quickly to any of your questions or requests ;-)

I changed the default branch to master now, I don't think I can give you access to the repo settings anyway.

[davidchambers]

Thanks. I just deleted develop, resolving this issue.