Hotfix on GitLab
<p>I'm trying to understand GitLab's suggested flow on <a href="http://docs.gitlab.com/ee/workflow/gitlab_flow.html" rel="noreferrer">http://docs.gitlab.com/ee/workflow/gitlab_flow.html</a>. But, I'm not really sure about this statement:</p>

<blockquote>
  <p>If you need to cherry-pick a commit with a hotfix it is common to
  develop it on a feature branch and merge it into master with a merge
  request, do not delete the feature branch. If master is good to go (it
  should be if you a practicing continuous delivery) you then merge it
  to the other branches.</p>
</blockquote>

<p>Does it mean, there will be more than 1 commit in the master? For example, the first commit (actually merge request) is to test whether the fix is working, the second commit is when the first commit fails.</p>

<p>The other thing is, (given that we have a production branch) if we merge the hotfix into master, I think we have to deploy the other features on the master, isn't it? Otherwise, we do cherry pick the hotfix commits in the master into the production branch.</p>

<p>Actually the suggested flow is not as detail as another flow in <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="noreferrer">http://nvie.com/posts/a-successful-git-branching-model/</a>. So, it's a bit confusing.</p>