Gitflow, how to handle in CI server a release branch publish with conflict with develop

Question

Imagine this situation:

The commit pointed to by the red arrow is merged into develop after the release branch is opened, but we want to publish the release without that commit .

If there is a conflict when merging release into develop , how is this handled in a CI server if we want to do this automatically?

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 master and should to be done manually?

Answer 1

如果发生冲突，则合并将停止，直到您解决这些冲突为止，因此不会创建带有红色箭头的合并提交。