title: Create a hotfix branch or a feature branch in gitflow model
body: <p>I'm using this model in my team: <a href="https://i.stack.imgur.com/IZNch.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/IZNch.png" alt="enter image description here"></a></p>
  
  <p>Today my project stats is following:</p>
  
  <ul>
  <li>The stable version is running in production using master branch</li>
  <li>We developed new functionalities that need to be tested before production, so we have a release branch be testing under <strong>SIT Environment</strong>. This new functionalities just can be merged with master after all tests in SIT Environment. </li>
  </ul>
  
  <p><strong>The problem:</strong> The <strong>Product Owner</strong> requested a new field in a Table in Production. So the team suggest two solutions:</p>
  
  <ul>
  <li><p>Create a hotfix branch from master , add the new field and deploy to a <strong>Test Environment</strong>. This hotfix can wait months until merge with master, because after <strong>test pass</strong> we need wait the <strong>Product Owner</strong> say that can go to production because this field depends on another system changes.</p></li>
  <li><p>Create a feature branch from develop and add this new field and deploy to a <strong>Test Environment</strong>. <strong>I think this is worst solution</strong> because i have things in develop that can't be merged to master, so i will need a <strong>cherry-pick</strong> to pick-up only desired changed from release to master. Remember that team is validating others functionalities in <strong>SIT Environment</strong> (release branch).</p></li>
  </ul>