问题描述
使用CI / CD方法，其中一种提到的原理，：
Using CI/CD approach, one of the principle mentioned, here:
Automate wherever possible
根据情况，可以通过两种方式进行合并：
Merging can be done two ways, based on the scenario:
1）快进合并
2）三向合并
思考是否有意义
推荐答案
否。合并冲突实际上是失败自动化的最终结果。
No. A merge conflict is literally the end result of a failure to automate.
记住：Git的表现最佳。为了确保它不会丢失任何数据，并且发生合并冲突，Git会以其标准的，偏执的方式告诉您，它可能会丢失数据，并且希望您进行干预。
Remember: Git is doing its best to ensure that it doesn't lose any data, and a merge conflict is Git telling you in its standard, paranoid fashion that it could lose data and it wants you to intervene.
只要有可能，自动化就是正确的心态。合并冲突非常具有自动化的风险，这将使根本无法实现自动化。
Automating wherever possible is the right mentality. Merge conflicts are very risky to automate, which would preclude the possibility of automating it at all.
这篇关于合并冲突自动化的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！