title: Should I Git Merge Develop Into Master and Then Back After Tagging?
body: <p>The question is: how do I achieve the correct version (shown with <code>git describe</code>) on <code>develop</code> after I merged it into <code>master</code> and tagged <code>master?</code></p>
  
  <p>I use common git branching - <code>master</code> for production. Let's say <code>git describe</code> shows <code>1.5</code> on <code>master,</code> and, after merging with <code>develop,</code> <code>master</code> shows <code>1.5-234-g1e894af</code>.<br>
  So I create a new annotated tag with <code>git tag -a 1.6</code> and thus <code>git describe master</code> now shows <code>1.6</code>.</p>
  
  <p>BUT: <code>git describe develop</code> still shows <code>1.5-something</code>, which is strange as for me - it has same commits as in <code>master</code> - why Git thinks it still belongs to <code>1.5</code> version?</p>
  
  <p>Nothing better comes into my brain, so I just merge master into develop, and after that develop shows version <code>1.6-2-...</code> which is acceptable but produces 1 more useless merge commit, and warns me about "merge made by recursive" which I also think makes no sense to do, but how to achieve correct version then?</p>