Git 冲突（conflict）该如何解决？

How to resolve a conflict in Git?

题目类型: 技术面试题

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

难度: medium

分类: DevOps

标签: Git, 面试题, Version Control

参考答案摘要

Answer If we want to resolve a conflict in Git, then we need to edit the files for fixing the conflicting changes and then we can run “git add” to add the resolved files and after that we can run the ...

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