diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-10-07 14:02:00 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-10-07 14:02:00 +0000 |
| commit | dd005ca482865e746ff4b8c16f1bc298b30cb1a9 (patch) | |
| tree | 59e840a6a5b3fd2f606503d84e7f9a343f9e527f | |
| parent | 8fad7e63a3eac7e88026d82cf7fa3696a3cb379b (diff) | |
| parent | 3386a82d5eb105f764e62e818bcec19b1c92be8e (diff) | |
| download | gitlab-ce-dd005ca482865e746ff4b8c16f1bc298b30cb1a9.tar.gz | |
Merge branch 'gitlabflow-references' into 'master'
Gitlabflow references
See merge request !1160
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 947646c756a..70edea9c8d7 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -309,3 +309,8 @@ If you need to merge in another branch after starting explain the reason in the If you have not pushed your commits to a shared location yet you can also rebase on master or another feature branch. Do not merge in upstream if your code will work and merge cleanly without doing so, Linus even says that [you should never merge in upstream at random points, only at major releases](http://lwn.net/Articles/328438/). Merging only when needed prevents creating merge commits in your feature branch that later end up littering the master history. + +### References + +- [Sketch file](https://www.dropbox.com/s/58dvsj5votbwrzv/git_flows.sketch?dl=0) with vectors of images in this article +- [Git Flow by Vincent Driessen](http://nvie.com/posts/a-successful-git-branching-model/) |