Skip to content
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.

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

Unify master and kzsu branches #22

Merged
merged 4 commits into from May 16, 2019

Conversation

Projects
None yet
1 participant
@RocketMan
Copy link
Owner

commented May 14, 2019

Historically, the 'generic' source has been in 'master' while kzsu-specificities resided in 'kzsu'. This presents a number of problems for both release engineering and development.

This PR implements #20 to unify kzsu into the master branch. Going forward, we will have two one long-lived branches:

  • master This will be the main branch. Its HEAD will always reflect the latest development changes. As a developer, you will branch and rebase from master;
    * stable This will be the latest code for production. During day to day development, the stable branch will not be interacted with. When the source code in the master branch is stable, it will be merged into stable and tagged with a release number.

The master branch will accept PRs from developers for new features. Stable will accept PRs only from master and ephemeral hotfix branches.

[Edit: We will have only one long-lived branch, master. Releases will be tagged, so the situation that was released can always be reproduced without devoting an entire branch for this purpose. If a critical bug is found at a moment when master can't be released, then it is easy enough to checkout the last release tag and start a new "hotfixes-for-release-xxx" branch from there.]

@RocketMan RocketMan changed the title unified master and kzsu branches Unify master and kzsu branches May 14, 2019

@RocketMan RocketMan force-pushed the unified-master branch from d1d61c6 to ba57fa4 May 14, 2019

@RocketMan RocketMan force-pushed the unified-master branch from 1442de5 to 2985da7 May 16, 2019

@RocketMan RocketMan merged commit 524ef9b into master May 16, 2019

@RocketMan RocketMan deleted the unified-master branch May 16, 2019

@RocketMan RocketMan referenced this pull request May 18, 2019

Closed

CSS regression testing... #24

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.