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.

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

Stable trunk #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stable trunk #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Ideas.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
# The Ideas
# The Ideas
All projects within Incubaid are using a stable trunk based development model. This mean that the master branch, the trunk, is always working (stable) and up to date with the latest code.

New features (stories) are developed and bugs are fixed on separate branches, story-branches. When they are “done” (developed, tested, documented), the story-branch is merged back to the trunk. Work is NOT “done” if it is not on trunk.

Next to story-branches there are release-branches. Only cherry-picks FROM trunk TO the release-branch are supported. The cherry-picks should be almost exclusively bug fixes. New features can be added only after the approval of the necessary stakeholders.

Continuous Integration (CI) tests are running against the trunk and in case something breaks, the issue gets resolved asap.

It is an obligation for developers not to break the build with any commit. This requires a lot of discipline. Rollback/revert of a commit is a strategy to prevent the damage (lost time) from breaking the trunk.