halcyon icon indicating copy to clipboard operation
halcyon copied to clipboard

Figure out a branching strategy and document it

Open ironicbadger opened this issue 5 years ago • 3 comments

Figure out a branching strategy and document it

ironicbadger avatar Oct 10 '20 19:10 ironicbadger

Suggestion:

develop represents current development, "unstable", default branch on GitHub. All PRs to/from this

master represents "stable". On release, commits are merged from develop into master, and tagged (useful for #12 )

Suggestion 2:

master represents current development, "unstable", default branch on GitHub. All PRs to/from this.

Releases are tracked as tags. To checkout, simply checkout by specific tag.

Personally I prefer the latter, as it removes the need for an extra branch.

RealOrangeOne avatar Oct 10 '20 19:10 RealOrangeOne

Suggestion 1 mirrors how Home Assistant does this.

It might be a plan to avoid the master branch name controversy and rename it to stable.

Landrash avatar Oct 11 '20 07:10 Landrash

i like 1 and also think we should use stable vs master...

WhiteNight121 avatar Oct 14 '20 23:10 WhiteNight121