title: How to hotfix a feature that's already in develop (git-flow)
body: <p>Scenario - using git-flow or similar:</p>
  
  <p>While underway with a stream of work, we become aware that one of the features which has been developed (in a feature-branch and already merged to the develop branch) needs to be urgently hotfixed before the other work in develop will be ready.</p>
  
  <p>What is best practice for achieving this?</p>
  
  <p>In git-flow, hotfixes are typically done using a hotfix branch off master. To follow that model, I'm wondering whether cherry-picking from develop to the hotfix branch is best, or retaining the feature branches after they've been merged to develop and merging those branches to the hotfix branch (or master)? Or something else?</p>