diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index 0ddafd0b3925acd6bf5bc87e8237924b40a9a7a0..2187d8b45ca42f99e1d1c3710523eead0b78942d 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.