diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-10-02 11:59:22 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-10-02 11:59:22 +0000 |
| commit | 9e78949e48a0dab5a82a70b17548848807d81586 (patch) | |
| tree | 6e6f32bdb0c22edca9894fc0739f3a37873e43a0 | |
| parent | 9f939c9697c735839072185a9792338f617a2a41 (diff) | |
| parent | a68a3f65af50e3e49f75ef5be4ec1e8eae183300 (diff) | |
| download | gitlab-ce-9e78949e48a0dab5a82a70b17548848807d81586.tar.gz | |
Merge branch 'gitlab_flow_edit' into 'master'
Gitlab flow edit
Changed GitHub Flow links
See merge request !201
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 2e21e3f27b3..947646c756a 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -26,7 +26,7 @@ After getting used to these three steps the branching model becomes the challeng Since many organizations new to git have no conventions how to work with it, it can quickly become a mess. The biggest problem they run into is that many long running branches that each contain part of the changes are around. People have a hard time figuring out which branch they should develop on or deploy to production. -Frequently the reaction to this problem is to adopt a standardized pattern such as [git flow](http://nvie.com/posts/a-successful-git-branching-model/) and [GitHub flow]() +Frequently the reaction to this problem is to adopt a standardized pattern such as [git flow](http://nvie.com/posts/a-successful-git-branching-model/) and [GitHub flow](https://guides.github.com/introduction/flow/index.html) We think there is still room for improvement and will detail a set of practices we call GitLab flow. # Git flow and its problems @@ -54,7 +54,7 @@ And doing releases doesn't automatically mean also doing hotfixes.  - In reaction to git flow a simpler alternative was detailed, [GitHub flow](http://scottchacon.com/2011/08/31/github-flow.html). + In reaction to git flow a simpler alternative was detailed, [GitHub flow](https://guides.github.com/introduction/flow/index.html). This flow has only feature branches and a master branch. This is very simple and clean, many organizations have adopted it with great success. Atlassian recommends [a similar strategy](http://blogs.atlassian.com/2014/01/simple-git-workflow-simple/) although they rebase feature branches. |