A merge conflict happens when two branches change the same lines of a file and Git cannot decide which version to keep. To resolve one, you open the marked file, choose the correct lines, remove the marker lines, then stage… Read moreHow to Resolve Merge Conflicts in Git: A Step-by-Step Guide