From 268c6acb7d4b0e4bb57d37cf78e024724895746a Mon Sep 17 00:00:00 2001 From: "cflap0019\\Wim Provoost" Date: Thu, 16 Jun 2016 14:34:32 +0200 Subject: [PATCH] Stable trunk --- Ideas.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Ideas.md b/Ideas.md index ce9db02..9576691 100644 --- a/Ideas.md +++ b/Ideas.md @@ -1 +1,10 @@ -# The Ideas \ No newline at end of file +# 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. \ No newline at end of file