Resolving Merge Conflicts
A conflict happens when two branches change the same line in different ways. No need to panic: learn to read conflict markers and resolve them step by step.
Lesson 13 of 24
Git & GitHub · Lesson 13 of 24
A conflict happens when two branches change the same line in different ways. No need to panic: learn to read conflict markers and resolve them step by step.