title: Bug fixes in a feature branch
body: <p>We're using a <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="noreferrer">A successful Git branching model</a> by Vincent Driessen  for our branching model. All's fine but I haven't really seen a particular issue brought up.</p>
  
  <p>From what I've understood, when a new feature is required, you branch of the <code>development</code> and create a new <code>feature</code> branch. You would work on this and when you're done, you would merge this branch into the the <code>development</code> branch. </p>
  
  <p>What if a developer makes a feature and then merges that feature back to <code>development</code> only to be found out that there's some bugs in the feature code. Where should this be fixed? Should a new <code>fix</code>/<code>bugfix</code> branch be started from development and the code be fixed there? I can't see another way.</p>
  
  <p>How should one go about this?</p>
  
  <p>Thanks</p>