在 Git 中如何处理/解决合并冲突（merge conflict）？

How do you handle merge conflicts in Git?

题目类型: 技术面试题

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

难度: medium

分类: DevOps

标签: Git, 面试题, Version Control

参考答案摘要

Answer Understand what happened : conflicts often occur when the same lines are edited differently, files are deleted/renamed, or changes overlap. Use git status to see conflicted files. Fix the confl...

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