Hi,
have been busy for quite some time but hopefully I'm back for now ;D
I'm not sure which branch to use at the moment:
master is 1.0.x ?
"developement" is the default branch?
Personally I'd favour to use a "1.0" branch for the 1.0 fixes and the master branch for developement.. Oppinions?
The moar people braking stuff the better! :D
Another discussion about it is here:
http://www.elkarte.net/community/index.php?topic=101.0
The general idea is to use:
master to keep the HEAD of the latest stable release (at that moment 1.0.1),
development for the development of the next version (1.1),
* and patch branches for micro-releases (e.g. 1.0.2).
Of course it's not set in stone, in the topic above Norv was suggesting to use master for development and another branch for the stable version.
If you feel another way would be easier to use why not. ;)
Thats great to hear !
I also set the development branch as the default one on GitHub, helps point where PR's go.
Other than that its what emanuele said. If there is an easier way or less confusing way for everyone then I'm all for it.