title: Git naming convention for successor branches?
body: <p>Imagine there is a feature branch (let's call it <code>lunch</code>) branched from <code>master</code>. I branch a new branch <code>lunch-pancakes</code> from <code>feature</code>. After committing some code to <code>lunch-pancakes</code>, while someone else commits to <code>lunch</code> we decide to merge the changes. I rebase <code>lunch-pancakes</code> on <code>lunch</code>, merge it and then delete the branch.</p>
  
  <p>Now, the development of pancakes hasn't stopped, and I want to do further changes into the code involving them, so I branch <code>lunch</code> into a new subfeature branch. How should I name it?</p>
  
  <ul>
  <li><code>lunch-pancakes</code> seems like a really bad idea</li>
  <li><code>lunch-pancakes-update</code> won't work for long. What do I do, when the situation arises again?</li>
  <li><code>lunch-pancakes2</code> might be acceptable?</li>
  </ul>
  
  <p>I don't want to name it after a specific sub-sub-feature (<code>lunch-pancakes-toppings</code>) as I don't know which subsubfeatures, bugfixes and other changes concerning <code>lunch-pancakes</code> are going to be committed to this branch before we decide to merge it into <code>lunch</code> again.</p>
  
  <p>Or is the workflow just plain wrong? How do you handle branch naming in such circumstances?</p>