Resolve Conflicts
Explore how to handle and resolve Git merge conflicts. Learn to identify conflict markers, use commands like git checkout with options, manually edit files, then add and commit to complete the merge process successfully.
We'll cover the following...
We'll cover the following...
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:
When we run git log, we won’t see the merge commit. This doesn’t mean the merge is aborted. It just means the merge is paused and waiting for further instructions from us.
Run ...