Feature branches for the fork? - Githubissues

calamares / calamares-manjaro

Manjaro specific modules for Calamares

GNU General Public License v3.0

18 stars 10 forks source link

Feature branches for the fork? #32

Open udeved opened 8 years ago

udeved commented 8 years ago

https://github.com/manjaro/calamares

Do we want branch per module?

or manjaro branch?

philmmanjaro commented 8 years ago

I created now a fork of Calamares. It includes following branches:

2.4.x-stable: all reviewed modules and approved changes for the current stable release
development: default repository with upstream pulls from 2.4.x-stable branch and our Manjaro modules in current development
experimental: all our changes from development plus commits from upstream master
upstream-master: pure fork of Calamares without our modules based on master branch

Guideline for our development

downstream development happens within our development branch. Anything goes here
PRs for 2.4.x-stable branch need a new pr-branch and a meaningful description what the module does and if it was already fully tested during our development cycle
PRs for upstream need also a new pr-branch which should be based on upstream-master branch. Additionally it should be in sync with upstream first.

Lets try this procedure and see if that is easier as we did before with calamares-manjaro repo ...