diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-02 11:23:26 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-02 11:23:26 +0200 |
| commit | 51b6e64db854c48a7b31ca6b8cf6c9f3beb7ff41 (patch) | |
| tree | e11cac3f418467cc82af78dc2b7c69e923dc31bb /doc/workflow | |
| parent | 47fdc972b865431263856000d4688b25122edd1d (diff) | |
| download | gitlab-ce-51b6e64db854c48a7b31ca6b8cf6c9f3beb7ff41.tar.gz | |
It's the shell.
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 0ddafd0b392..2187d8b45ca 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -254,7 +254,7 @@ If you have long lived feature branches that last for more than a few days you s # Merging in other code -![vim screen showing git pull output]() When branching of a feature branch always start with an up to date master to branch of from. +![Shell output showing git pull output]() When branching of a feature branch always start with an up to date master to branch of from. If you know beforehand that you work absolutely depends on another branch you can also branch from there. If you need to merge in another branch after starting explain the reason in the merge commit. If you have not pushed your commits to a shared location yet you can also rebase on master or another feature branch. |