Resolve Conflicts

Learn to resolve the merge conflicts that occur while merging branches.

In the previous lesson, we explored how we could run into merge conflicts. Now, we’ll learn to resolve them.

Merge conflict between branches

We created two branches, Branch_A and Branch_B. They modified the same line in the file1.txt, which caused a conflict warning. The terminal below shows this warning:

Get hands-on with 1200+ tech skills courses.