title: Maintaining releases/branches in an "agile" rhythm?
body: <p>We have a software product that evolves at the rhythm of clients' needs and of a more general roadmap.</p>
  
  <p>Because we are in a SCRUM project environment, it happens very regurlarly that a new feature makes its way to the product, and then we are confronted with the choice of:</p>
  
  <ul>
  <li>implementing this feature in an already released branch (not really the point of having a branch, then)</li>
  <li>making a new branch - but then we have a branch every three weeks, and it is just not maintanable anymore</li>
  </ul>
  
  <p>Not releasing the new feature is not an option, the clients don't want to wait for a long term milestone plan to get the features they want, and it's not always faisible to move the feature in a client module - sometimes we need to change the core of the product...</p>
  
  <p>Has anyone any feedback on a good practice given those kind of constraints ?</p>