New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature branches for the fork? #32

Open

udeved opened this issue Sep 10, 2016 · 1 comment

Contributor

udeved commented Sep 10, 2016

https://github.com/manjaro/calamares

Do we want branch per module?

or manjaro branch?

Member

philmmanjaro commented Sep 10, 2016

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 ...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment