Git & GitHub · Branching & Merging · Lesson 7 of 11
Resolving Merge Conflicts
Concept
Resolving Merge Conflicts
A conflict happens when Git cannot automatically combine changes. You edit the file to choose the final version, then commit.
By the end of this lesson
- Explain the core idea behind Resolving Merge Conflicts.
- Predict output before running a change.
- Test one realistic and one unusual input.
- Use the result to make the next decision.
How to study this page
- 1. Read one concept.
- 2. Change the example.
- 3. Run, compare, and explain.
- 4. Complete the challenge below.
ExampleRunnable
<<<<<<< HEAD
const title = "Home";
=======
const title = "Dashboard";
>>>>>>> feature-branchSelf-check before continuing
Without looking at the example, describe what changes when you modify one input in Resolving Merge Conflicts. Then reopen the editor and prove your explanation with a small test.
You are ready to continue when you can predict, test, and explain the result.
Your turn
Explain what the conflict markers in a conflicted file mean.
Loading editor…
Console