Lesson 5
Unlock this lesson
Create a free account, then buy the course to open every lesson.
What you will learn in this lesson
- Say why a merge conflict happens.
- Make a conflict on purpose with two branches.
- Read the conflict markers in a file.
- Fix a conflict with the VS Code buttons, the merge editor, or by hand.
- Stop a merge with git merge --abort.
Everything in GitHub
- 12 step-by-step lessons
- 2 mini projects with solutions
- A final project for your portfolio
- Real commands and real output in every lesson
- Practice task with a solution in each lesson
- Progress saved to your account