Project: Resolve a real merge conflict
45 min · Beginner
Need help? Ask a tutor on WhatsApp (opens in a new tab)A merge conflict happens when two branches change the same lines and Git cannot know which version to keep, so it stops and asks you to decide.
What you will learn
What you will learn
- Explain why a merge conflict happens
- Read conflict markers and know which side is which
- Resolve a conflict, test the program and finish the merge
- Update a pull request that has a conflict
Sign in to continue this lesson
Create an account to read every lesson, practise with the exercises and keep track of your progress.