home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Link blog post

Browse Source
This commit is contained in:
Sytse Sijbrandij
2015-11-07 00:26:06 +00:00
parent 10d8f0ae26
commit 87ce149d93
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/workflow/gitlab_flow.md
+2 -1
View File
@@ -320,7 +320,8 @@ If you have not pushed your commits to a shared location yet you can also rebase
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
## 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/)
- [Blog post with responses](https://about.gitlab.com/2014/09/29/gitlab-flow/)