title: Gitflow, how to handle in CI server a release branch publish with conflict with develop
body: <p>Imagine this situation:</p>
  
  <p><a href="https://i.stack.imgur.com/BUVVa.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/BUVVa.png" alt="enter image description here"></a></p>
  
  <p>The commit pointed to by the red arrow is merged into <code>develop</code> after the <code>release</code> branch is opened, but we want to <strong>publish the <code>release</code> without that commit</strong>. </p>
  
  <p>If there is a conflict when merging <code>release</code> into <code>develop</code>, how is this handled in a CI server if we want to do this automatically? </p>
  
  <p>Is it acceptable to merge into the master branch while the merge into develop is pending due to conflicts?  Or there is no merge into <code>master</code> and should to be done manually? </p>