[英]Gitflow, how to handle in CI server a release branch publish with conflict with develop
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 . 提交指向红色箭头被合并到
develop
后release
分支被打开,但我们要发布的release
没有这种承诺 。
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? 如果合并时有冲突
release
到develop
,这是怎么在CI服务器来处理,如果我们想这样做自动?
Is it acceptable to merge into the master branch while the merge into develop is pending due to conflicts? 合并到开发分支由于冲突而挂起时,是否可以合并到master分支中? Or there is no merge into
master
and should to be done manually? 还是没有合并到
master
,应该手动完成?
如果发生冲突,则合并将停止,直到您解决这些冲突为止,因此不会创建带有红色箭头的合并提交。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.