search

xbmc / skin.confluence

Other
51 stars 74 forks source link

Sync master with Nexus #232

Closed Hitcher closed 6 months ago

jjd-uk commented 6 months ago

Seems to fit with https://github.com/xbmc/skin.confluence/compare/master...Nexus so go for it.

In future I'd suggest:

  1. Master is the branch for working towards next user release. So now Nexus is done Master should be for any Omega changes.
  2. All PR's MUST be made to Master first, if a fix then once merged into Master a seperate PR to be done to the relevant release/s branches.
  3. Once Master is in a fit enough state for an Omega release, only then create an Omega branch at the point a PR is ready to be made to skin repo for the update to users.
  4. Once Omega branch is created then Master becomes working branch for v22.