From ec7d923e684487147ba341c57f71a2fc80c4f20d Mon Sep 17 00:00:00 2001 From: "BCOM\\jroyan" Date: Tue, 2 Nov 2021 18:31:52 +0100 Subject: [PATCH 1/3] Add branch policy documentation to the readme --- README.md | 15 +++++++++++++++ doc/images/branchingPolicy.png | Bin 0 -> 28961 bytes 2 files changed, 15 insertions(+) create mode 100644 doc/images/branchingPolicy.png diff --git a/README.md b/README.md index b335231..09a2fad 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,18 @@ https://swagger.io/tools/swagger-codegen/ https://swagger.io/docs/open-source-tools/swagger-codegen/ +# Branching Policy +Distributed version control systems like Git offers developers great flexibility to share and manage code. But a branching policy is crucial to collaborate more easily while keeping track of releases with bug fixes. + +We consider 5 categories of branches: +- **develop**: collects the different features. While it is recommended that this branch be as stable as possible, each commit is not considered as a release, but much more as a pre-release. +- **feature**: dedicated to the development of features (named ***feature/*** *featureName*). These feature branches allow to share code among developers working on a common feature. When a feature is implemented, it must be tested before merging it to the develop branch with a pull request. When a feature branch is merged into develop, it must be suppress from the reposiory. It is recommended that the develop branch be merged into the feature branches on a regular basis to avoid any drift. +- **master**: corresponds to the last version of stable code. The develop branch is merged in the master branch when a release is ready. Bug fixes from release branches are also merged is the master branch when useful. +- **release**: dedicated to the releases. One branch per minor version release must be created (named ***release/*** *major_minor_patch*), and a tag must be set. When a bug is fixed on a release, it should be merge is the release branch. Then a new tag is created by increasing the patch digit of the release version. +- **bug**: dedicated to the bug fix of releases (named ***bug/*** *bugID*). + +Branching strategy + + + + diff --git a/doc/images/branchingPolicy.png b/doc/images/branchingPolicy.png new file mode 100644 index 0000000000000000000000000000000000000000..75597a218085e89d3a798c99497b080091f4e03c GIT binary patch literal 28961 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

kXA&XsSoi4?n#$vP66CD*`+`p(gRr0y8o~<$ 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 literal 0 HcmV?d00001 -- GitLab From 4c49b637d0b8bbc2cdc0fa444c11ea57bcd306ed Mon Sep 17 00:00:00 2001 From: Jerome Royan Date: Tue, 2 Nov 2021 18:46:27 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09a2fad..5c50c51 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ We consider 5 categories of branches: - **release**: dedicated to the releases. One branch per minor version release must be created (named ***release/*** *major_minor_patch*), and a tag must be set. When a bug is fixed on a release, it should be merge is the release branch. Then a new tag is created by increasing the patch digit of the release version. - **bug**: dedicated to the bug fix of releases (named ***bug/*** *bugID*). -Branching strategy +Branching strategy -- GitLab From 7862406634368d23fe1568315a04b1e6ea370ffe Mon Sep 17 00:00:00 2001 From: Jerome Royan Date: Tue, 2 Nov 2021 18:47:20 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c50c51..7a0c3f4 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ We consider 5 categories of branches: - **release**: dedicated to the releases. One branch per minor version release must be created (named ***release/*** *major_minor_patch*), and a tag must be set. When a bug is fixed on a release, it should be merge is the release branch. Then a new tag is created by increasing the patch digit of the release version. - **bug**: dedicated to the bug fix of releases (named ***bug/*** *bugID*). -Branching strategy +Branching strategy -- GitLab