Differences

This shows you the differences between two versions of the page.

--- en:gitflow [2016/12/26 14:50] – [Gitflow] Domperss
+++ en:gitflow [2021/12/03 18:19] (current) – external edit 127.0.0.1
@@ Line 13: / Line 13: @@
 ===== Presentation =====
-GitFlow is based on a clear hierarchy of branches, which avoids unwanted commits on the main branches. The idea is to make clear the addition of features, and to maintain stable states on the main branches.
+GitFlow is based on a clear hierarchy of branches, which avoids unwanted commits on the main branches. The idea is to make clear additions of features, and to maintain stable states on the main branches.
-There are generally several basic branches in a project managed according to the GitFlow model:
+There are generally several basic branches in a project(managed according to the GitFlow model):
-  * **Master** branch, which production version;
+  * **Master** branch, the production version;
-  * The **Develop** branch, which is the unstable version, but in a Debian-like sense: it's not the bazaar, it's just that it can sometimes have unexpected functioning... bugs can appear!
+  * The **Develop** branch, which is the unstable version, but in a "Debian-like" sense: "it's not crap, it's just that it can sometimes have unexpected functioning... bugs can appear!"
-  * **Feature** branches, each of which relates to the addition of a complex functionality(this may be related to a [[http://docs.gitlab.com/ee/gitlab-basics/create-issue. Html |Issue]], or even a set). After completing the work, we merge on **Develop**(and this automatically closes Issue [[http://docs.gitlab.com/ce/customization/issue_closing.html |if you commit correctly]])
+  * **Feature** branches, each of which relates to the addition of a complex functionality(this may be related to a [[http://docs.gitlab.com/ee/gitlab-basics/create-issue. Html |Issue]], or even a set). After completing the work, we merge on **Develop**(and this automatically closes the issue of [[http://docs.gitlab.com/ce/customization/issue_closing.html |if you commit correctly]])
-  * A branch **Release**, which is a new branch, based on **Develop**, created when we think it mature for a new version of production. It only commits bug fixes. Once these are completed, one merges on the main branch, **Master**;
+  * A branch **Release**, which is a new branch, based on **Develop**, created when we think it's mature enough for a new production version. It only commits bug fixes. Once these are completed, one merges on the main branch, **Master**;
-  * Branches **Hotfix** that relate to the **Master** branch, when a bug has been detected and it is imperative to remedy it quickly. Once the solution is found, we merge the **HotFix** branch on the **Master** branch(and we include the patch in the **Develop** branch).
+  * Branches **Hotfix** relates to the **Master** branch, for ex: when a bug has been detected and it is imperative for a quick remedy. Once the solution is found, we merge the **HotFix** branch on the **Master** branch(and we include the patch in the **Develop** branch).
-In image, this gives:
+The branches shown in this picture:
 {{ :fr:gitflow.png?nolink |Image extracted from the site http://nvie.com/posts/a-successful-git-branching-model/ © Vincent Driessen}}