<ul data-eligibleForWebStory="true"><li>Merge conflicts are common in software development even for experienced developers.</li><li>When two developers make changes to the same file in different branches, a merge conflict can occur when merging the changes back to the main branch.</li><li>To resolve a merge conflict, developers need to manually edit the file, choose which changes to keep, delete conflict markers, mark the conflict as resolved, and finalize the merge.</li><li>After resolving a merge conflict, a special commit is created to record the manual merging of conflicting changes between branches, showing that the changes now coexist in the project history.</li></ul>

Merge Conflict? Here’s Exactly What Happens — and How to Fix It Step by Step

Discover more