Courses / GitHub
20. Resolving merge conflicts
Identifying and resolving merge conflicts locally and completing the merge with proper commits.
Git / Bash
Resolving merge conflicts
Resolving merge conflicts is the process of fixing overlapping changes from different branches so Git can complete the merge.
"I pulled someone else's changes and my file now has weird markers—how do I make the branch sane again?"
When two branches change the same lines (or nearby lines) in a file, Git marks the conflict in the working tree; you inspect and edit the file to choose or combine changes, then mark the conflict resolved and finish the merge with a commit.
"I pulled someone else's changes and my file now has weird markers—how do I make the branch sane again?"
When two branches change the same lines (or nearby lines) in a file, Git marks the conflict in the working tree; you inspect and edit the file to choose or combine changes, then mark the conflict resolved and finish the merge with a commit.