All contributions (pull-request) have to be done towards develop branch. If a feature or bugfix is a major change please contact me to prepare feature specific handling.
master: Branch that contains latest production (stable) release. No pull-requests other than stable releases will be merged into master.
develop: Main development branch: contains latest features and fixes.
This will mean that all contributors will have to submit a pull request to develop , after successfull testing it will be merged in master
Project Contributing flow:
- Fork repository
- Create a branch off develop (name it feature/mynewfeature or fix/myfix)
- Build, test your code against a real device
- Commit changes
- Push your changes to your fork on github
- Submit PR to esp_rgbww_fhemmodule repostitory( develop branch).
- Work with other contributors to test your feature and get it merged to develop
This is the most common approach for a git-flow: http://nvie.com/posts/a-successful-git-branching-model/