search

selfhostedshow / halcyon

Home Assistant Linux Companion
https://halcyon.casa/
45 stars 4 forks source link

Figure out a branching strategy and document it #14

Open ironicbadger opened 4 years ago

ironicbadger commented 4 years ago

Figure out a branching strategy and document it

RealOrangeOne commented 4 years ago

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.

Landrash commented 4 years ago

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.

WhiteNight121 commented 4 years ago

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