How do you define a 'conflict' in git？

How do you define a ‘conflict’ in git?

题目类型: 技术面试题

这是一道技术面试题，常见于澳洲IT公司面试中。

难度: hard

分类: DevOps

标签: Git, 面试题, Version Control

参考答案摘要

Answer If we want to merge a commit there is a change in one place and the same change already exists then while merging the Git will not be able to predict which is the change that needs to be taken ...

本题提供 STAR 原则详细解答和技术解析，登录匠人学院学习中心即可查看完整答案。