What are Merge Conflicts?

Merge conflicts happen when Git can't automatically determine how to resolve conflicting code changes between commits from two different branches. You need to manually resolve merge conflicts.

In Git, a merge is when users combine commits from different branches. In most cases Git uses the merge strategy that you specified in the Git pane's Merge to resolve the differences between two commits. But in some cases, such as where users have updated the same line of code differently, Git doesn't know which code change is correct. These situations create merge conflicts that you manually resolve by telling Git which code changes to keep and which to discard.

After you manually resolve the merge conflicts, you can successfully commit the changes to the repository.